Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97fe836b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97fe836b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97fe836b Branch: refs/heads/ignite-1.4 Commit: 97fe836b9a83227e4e87043227da02e4834fea70 Parents: 1a4d193 bbfee45 Author: Denis Magda <[email protected]> Authored: Tue Sep 8 10:41:34 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Tue Sep 8 10:41:34 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 11 +- .../processors/cache/GridCacheEntryEx.java | 12 +- .../cache/GridCacheEvictionManager.java | 2 + .../processors/cache/GridCacheMapEntry.java | 11 +- .../cache/GridCacheMvccCandidate.java | 6 +- .../cache/GridCacheSharedContext.java | 7 + .../processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 14 +- .../distributed/dht/GridDhtLocalPartition.java | 23 +- .../distributed/dht/GridDhtLockFuture.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 22 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 3 + .../colocated/GridDhtColocatedLockFuture.java | 14 +- .../dht/preloader/GridDhtPreloader.java | 20 +- .../distributed/near/GridNearLockFuture.java | 14 +- .../near/GridNearOptimisticTxPrepareFuture.java | 7 +- .../distributed/near/GridNearTxRemote.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 20 +- .../cache/CacheAffinityCallSelfTest.java | 16 +- .../cache/CacheSwapUnswapGetTest.java | 234 +++++++++++++++++++ .../processors/cache/GridCacheMvccSelfTest.java | 29 +-- .../IgniteCacheFailoverTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 3 + 23 files changed, 410 insertions(+), 75 deletions(-) ----------------------------------------------------------------------
