Merge remote-tracking branch 'remotes/community/ignite-3477-master' into ignite-1794
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b884eff Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b884eff Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b884eff Branch: refs/heads/ignite-1794 Commit: 6b884eff6baf592e6229503567ae6af508606a89 Parents: b709ddf a7afb7f Author: sboikov <[email protected]> Authored: Mon Apr 10 14:16:32 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Apr 10 14:16:32 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 3 + .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../processors/cache/GridCacheProcessor.java | 25 ++++ .../cache/IgniteCacheOffheapManagerImpl.java | 8 +- .../IgniteCacheDatabaseSharedManager.java | 6 +- .../cache/CacheClientStoreSelfTest.java | 4 + .../cache/CacheStopAndDestroySelfTest.java | 48 ++++++-- .../cache/ClusterStateAbstractTest.java | 5 +- .../GridCacheConditionalDeploymentSelfTest.java | 19 ++- ...heExpiredEntriesPreloadAbstractSelfTest.java | 122 ------------------- ...acheAtomicExpiredEntriesPreloadSelfTest.java | 46 ------- ...idCacheDhtExpiredEntriesPreloadSelfTest.java | 39 ------ ...dCacheNearExpiredEntriesPreloadSelfTest.java | 33 ----- .../testsuites/IgniteCacheTestSuite2.java | 9 +- .../cache/hibernate/HibernateCacheProxy.java | 2 +- 15 files changed, 95 insertions(+), 276 deletions(-) ----------------------------------------------------------------------
