Merge remote-tracking branch 'apache/ignite-1.5' into 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/388a8921 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/388a8921 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/388a8921 Branch: refs/heads/ignite-1816 Commit: 388a8921032af9e055a021e6f859c030eaaa5ea8 Parents: dbadb45 cb28819 Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Tue Nov 10 16:48:14 2015 -0800 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Tue Nov 10 16:48:14 2015 -0800 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 34 ++-- .../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 +- 10 files changed, 265 insertions(+), 45 deletions(-) ----------------------------------------------------------------------