Merge remote-tracking branch 'remotes/origin/ignite-1.5'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba2ffb07 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba2ffb07 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba2ffb07 Branch: refs/heads/ignite-direct-marsh-opt Commit: ba2ffb07b936063a84342995ab0875cac97c612e Parents: ee5a50f 67f8858 Author: Anton Vinogradov <a...@apache.org> Authored: Tue Nov 10 16:15:52 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Tue Nov 10 16:15:52 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 1 + .../eviction/random/RandomEvictionPolicy.java | 4 + .../processors/cache/GridCacheAdapter.java | 22 ++- .../GridCachePartitionExchangeManager.java | 34 ++-- .../processors/cache/IgniteCacheProxy.java | 6 + .../dht/preloader/GridDhtPartitionDemander.java | 25 ++- .../GridCacheAtomicReferenceImpl.java | 2 +- .../store/GridCacheBalancingStoreSelfTest.java | 181 ++++++++++++++++++- ...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +- modules/rest-http/pom.xml | 11 ++ .../yardstick/config/ignite-store-config.xml | 31 ++-- 11 files changed, 291 insertions(+), 46 deletions(-) ----------------------------------------------------------------------