Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-9614
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98008911 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98008911 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98008911 Branch: refs/heads/ignite-gg-9614 Commit: 98008911ea938e795b8be2bde6cba63101a3a080 Parents: 436227d d87f6d6 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Wed May 13 17:47:04 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Wed May 13 17:47:04 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 7 + .../processors/cache/GridCacheMapEntry.java | 70 ++++--- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../dht/GridDhtOffHeapCacheEntry.java | 63 ++++++ .../dht/GridDhtTransactionalCacheAdapter.java | 9 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 3 + .../atomic/GridDhtAtomicOffHeapCacheEntry.java | 63 ++++++ .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../GridDhtColocatedOffHeapCacheEntry.java | 63 ++++++ .../distributed/near/GridNearCacheAdapter.java | 3 + .../near/GridNearOffHeapCacheEntry.java | 60 ++++++ .../cache/local/GridLocalCacheEntry.java | 18 ++ .../cache/CacheOffheapMapEntrySelfTest.java | 168 ++++++++++++++++ .../distributed/GridCacheLockAbstractTest.java | 2 - ...achePartitionedNearDisabledLockSelfTest.java | 47 +++++ .../GridCachePartitionedTxSalvageSelfTest.java | 25 +-- .../GridCacheReplicatedLockSelfTest.java | 5 + .../discovery/tcp/TcpDiscoveryRestartTest.java | 199 +++++++++++++++++++ .../testsuites/IgniteCacheTestSuite2.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 21 files changed, 783 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
