Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8051418507 for ; Tue, 11 Aug 2015 07:27:45 +0000 (UTC) Received: (qmail 85248 invoked by uid 500); 11 Aug 2015 07:27:39 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 85172 invoked by uid 500); 11 Aug 2015 07:27:39 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 85158 invoked by uid 99); 11 Aug 2015 07:27:39 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2015 07:27:39 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id C7F3C18193D for ; Tue, 11 Aug 2015 07:27:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 7As7NCEIvf6j for ; Tue, 11 Aug 2015 07:27:37 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 3CE9234A93 for ; Tue, 11 Aug 2015 07:27:15 +0000 (UTC) Received: (qmail 82925 invoked by uid 99); 11 Aug 2015 07:27:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2015 07:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BEE5E1894; Tue, 11 Aug 2015 07:27:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 11 Aug 2015 07:27:55 -0000 Message-Id: <13f03945478f418881a8ae3ce5cc5cd8@git.apache.org> In-Reply-To: <01fe7fc564c3447aa57a428396b623f3@git.apache.org> References: <01fe7fc564c3447aa57a428396b623f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 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-426 Commit: 455d4dc20325815f4557be12485af871dc7c1feb Parents: 2a8b548 ae11e9b Author: Valentin Kulichenko Authored: Mon Aug 10 23:59:15 2015 -0700 Committer: Valentin Kulichenko 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 ----------------------------------------------------------------------