Merge remote-tracking branch 'remotes/origin/ignite-91' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6e4f450 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6e4f450 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6e4f450 Branch: refs/heads/ignite-32 Commit: c6e4f450755c8912b088ef1bb16873eb20e45b13 Parents: 029e96b 645aa34 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 29 09:19:12 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 29 09:19:12 2015 +0300 ---------------------------------------------------------------------- .../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 +- 11 files changed, 438 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
