Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0864e840 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0864e840 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0864e840 Branch: refs/heads/ignite-32 Commit: 0864e84029922eb5ba172a6a08c3ed5a3b788adf Parents: e178459 87d1de1 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jan 29 14:19:21 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jan 29 14:19:21 2015 +0700 ---------------------------------------------------------------------- assembly/libs/readme.txt | 111 +++---- docs/core-site.gridgain.xml | 89 ------ docs/core-site.ignite.xml | 89 ++++++ docs/gridgain_readme.md | 149 --------- docs/gridgain_readme.pdf | Bin 407698 -> 0 bytes docs/hadoop_readme.md | 80 ++--- docs/hadoop_readme.pdf | Bin 411788 -> 82297 bytes docs/hive-site.gridgain.xml | 36 --- docs/hive-site.ignite.xml | 36 +++ docs/ignite_readme.md | 100 ++++++ docs/ignite_readme.pdf | Bin 0 -> 76810 bytes docs/mapred-site.gridgain.xml | 79 ----- docs/mapred-site.ignite.xml | 79 +++++ examples/config/filesystem/readme.txt | 4 +- examples/config/hibernate/readme.txt | 4 +- examples/config/servlet/readme.txt | 2 +- ipc/readme.txt | 4 +- ipc/shmem/readme.txt | 10 +- modules/aop/readme.txt | 12 +- modules/aws/readme.txt | 12 +- .../integration/ClientAbstractSelfTest.java | 8 +- .../processors/cache/GridCacheAdapter.java | 26 +- .../dht/GridPartitionedGetFuture.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 25 ++ .../dht/atomic/GridNearAtomicUpdateFuture.java | 29 +- .../dht/colocated/GridDhtColocatedCache.java | 3 + .../distributed/near/GridNearGetFuture.java | 11 +- .../local/atomic/GridLocalAtomicCache.java | 70 ++++- .../transactions/IgniteTxLocalAdapter.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 301 +++++++++++++++++-- .../dht/GridCacheAtomicFullApiSelfTest.java | 11 +- .../shmem/GridIpcSharedMemorySpaceSelfTest.java | 14 +- modules/core/src/test/resources/readme.txt | 2 +- modules/email/readme.txt | 12 +- modules/hadoop/readme.txt | 12 +- modules/hibernate/readme.txt | 14 +- modules/indexing/readme.txt | 12 +- modules/jcl/readme.txt | 12 +- modules/jta/readme.txt | 12 +- modules/log4j/readme.txt | 12 +- modules/rest-http/readme.txt | 12 +- modules/scalar/readme.txt | 8 +- modules/schedule/readme.txt | 12 +- modules/slf4j/readme.txt | 12 +- modules/spring/readme.txt | 12 +- modules/ssh/readme.txt | 12 +- modules/urideploy/readme.txt | 12 +- modules/web/readme.txt | 16 +- 48 files changed, 936 insertions(+), 666 deletions(-) ----------------------------------------------------------------------
