Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1ecf65f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1ecf65f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1ecf65f Branch: refs/heads/ignite-843-rc2 Commit: e1ecf65f1abfc1b077b0b2962d6d5855afeb5258 Parents: ffd7b2b 7f35bc6 Author: Alexey Kuznetsov <[email protected]> Authored: Thu Dec 17 15:01:02 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Dec 17 15:01:02 2015 +0700 ---------------------------------------------------------------------- .../store/jdbc/CacheJdbcStoreExample.java | 1 - .../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 + 17 files changed, 593 insertions(+), 61 deletions(-) ----------------------------------------------------------------------
