Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0e6f29d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0e6f29d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0e6f29d Branch: refs/heads/ignite-264 Commit: b0e6f29d72f4dfdf446d0848743424e62845e18b Parents: 3c09254 ae11e9b Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Aug 11 15:46:25 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Aug 11 15:46:25 2015 -0700 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 +++++++---- .../dht/atomic/GridDhtAtomicCache.java | 36 +++++--- .../cache/CacheStopAndDestroySelfTest.java | 87 -------------------- 4 files changed, 56 insertions(+), 116 deletions(-) ----------------------------------------------------------------------
