Merge branches 'ignite-430' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-430
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80285592 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80285592 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80285592 Branch: refs/heads/ignite-430 Commit: 80285592bb1436f794cb71ad81091e37e6222e87 Parents: c2e7d36 d87f6d6 Author: Yakov Zhdanov <[email protected]> Authored: Wed May 13 18:54:45 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed May 13 18:54:45 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 7 + .../processors/cache/GridCacheMapEntry.java | 70 +++++--- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../dht/GridDhtOffHeapCacheEntry.java | 63 +++++++ .../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 +++++++++++++++++++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 14 files changed, 514 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
