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 DFEFF18548 for ; Fri, 24 Apr 2015 06:25:42 +0000 (UTC) Received: (qmail 2512 invoked by uid 500); 24 Apr 2015 06:25:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 2483 invoked by uid 500); 24 Apr 2015 06:25:42 -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 2473 invoked by uid 99); 24 Apr 2015 06:25:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 06:25:42 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 06:25:38 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id F2A2825FB3 for ; Fri, 24 Apr 2015 06:24:29 +0000 (UTC) Received: (qmail 94779 invoked by uid 99); 24 Apr 2015 06:24:29 -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; Fri, 24 Apr 2015 06:24:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4665E17F8; Fri, 24 Apr 2015 06:24:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 24 Apr 2015 06:25:05 -0000 Message-Id: <88c04981fab64dfb91d3cd682e649e3e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/46] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-656 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-656 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e55cabb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e55cabb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e55cabb0 Branch: refs/heads/ignite-gg-9702 Commit: e55cabb008803fbd72aeb9c1095e2ff1ac33393c Parents: 3fc44aa 0ee2799 Author: sboikov Authored: Thu Apr 23 12:07:46 2015 +0300 Committer: sboikov Committed: Thu Apr 23 12:07:46 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAffinityManager.java | 12 ------- .../processors/cache/IgniteCacheProxy.java | 15 +++++++-- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-- .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++++++++++++++++++ .../IgniteCacheFailoverTestSuite.java | 3 +- 11 files changed, 58 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e55cabb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e55cabb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e55cabb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e55cabb0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------