Merge remote-tracking branch 'origin/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/6b158c9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b158c9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b158c9d Branch: refs/heads/ignite-638 Commit: 6b158c9ddf61159ce8f622832713e0bc508d1fb8 Parents: d567d259 388a892 Author: sboikov <sboi...@gridgain.com> Authored: Wed Nov 11 10:20:22 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Nov 11 10:20:22 2015 +0300 ---------------------------------------------------------------------- .../cache/store/CacheStoreSessionListener.java | 9 +- .../jdbc/CacheJdbcStoreSessionListener.java | 8 +- .../GridCachePartitionExchangeManager.java | 34 ++-- .../dht/preloader/GridDhtPartitionDemander.java | 25 ++- .../store/GridCacheStoreManagerAdapter.java | 26 ++- .../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 +- 13 files changed, 293 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
