Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e1017b3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e1017b3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e1017b3 Branch: refs/heads/ignite-direct-marsh-opt Commit: 0e1017b35dd4d1b8e4c2f0c6aeed194e87d89203 Parents: 946360a 57ea0ff Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Tue Nov 10 16:49:21 2015 -0800 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Tue Nov 10 16:49:21 2015 -0800 ---------------------------------------------------------------------- .../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 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../org/apache/ignite/stream/StreamAdapter.java | 2 +- .../store/GridCacheBalancingStoreSelfTest.java | 181 ++++++++++++++++++- ...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +- modules/rest-http/pom.xml | 11 ++ .../yardstick/config/ignite-store-config.xml | 31 ++-- modules/zookeeper/pom.xml | 2 +- 14 files changed, 294 insertions(+), 49 deletions(-) ----------------------------------------------------------------------