Merge remote-tracking branch 'remotes/origin/master' into ignite-946
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/801d6df1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/801d6df1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/801d6df1 Branch: refs/heads/master Commit: 801d6df1acd2615c1a85e9e3829983011b5fd0a3 Parents: b6bef13 ae11e9b Author: Denis Magda <dma...@gridgain.com> Authored: Tue Aug 11 10:19:21 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Aug 11 10:19:21 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 +++++++---- .../dht/atomic/GridDhtAtomicCache.java | 36 +++++--- .../cache/CacheStopAndDestroySelfTest.java | 87 -------------------- 4 files changed, 56 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/801d6df1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------
