Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f35bc6d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f35bc6d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f35bc6d Branch: refs/heads/ignite-2100 Commit: 7f35bc6d13cd609e63b8e59b1a28d30f402bd44f Parents: d204b0e 96dc238 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Dec 17 09:32:08 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Dec 17 09:32:08 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProcessor.java | 8 +- .../cache/GridCacheSharedContext.java | 20 + .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 15 +- .../dht/GridPartitionedSingleGetFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java | 30 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 11 +- .../IgniteCacheStoreValueAbstractTest.java | 2 +- .../IgniteStartCacheInTransactionSelfTest.java | 39 +- .../CacheGetInsideLockChangingTopologyTest.java | 475 +++++++++++++++++++ .../IgniteCacheFailoverTestSuite3.java | 2 + 16 files changed, 593 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
