Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2640daeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2640daeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2640daeb Branch: refs/heads/ignite-843 Commit: 2640daeb519974217f4364a6b897979f7b22fb87 Parents: 2c1d18f 19fb305 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Aug 11 09:33:48 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Aug 11 09:33:48 2015 +0700 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 16 ++-- .../dht/atomic/GridDhtAtomicCache.java | 36 +++++--- .../cache/CacheStopAndDestroySelfTest.java | 87 -------------------- 4 files changed, 36 insertions(+), 104 deletions(-) ----------------------------------------------------------------------
