Repository: incubator-ignite Updated Branches: refs/heads/ignite-1191 [created] b0bdf04a6
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/455d4dc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/455d4dc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/455d4dc2 Branch: refs/heads/ignite-1191 Commit: 455d4dc20325815f4557be12485af871dc7c1feb Parents: 2a8b548 ae11e9b Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Aug 10 23:59:15 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Aug 10 23:59:15 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455d4dc2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------
