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 20FBE17D15 for ; Fri, 24 Apr 2015 01:16:18 +0000 (UTC) Received: (qmail 47360 invoked by uid 500); 24 Apr 2015 01:16:18 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 47291 invoked by uid 500); 24 Apr 2015 01:16:18 -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 47271 invoked by uid 99); 24 Apr 2015 01:16:18 -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 01:16:18 +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: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 01:16:10 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id F1DEA43E91 for ; Fri, 24 Apr 2015 01:15:49 +0000 (UTC) Received: (qmail 42385 invoked by uid 99); 24 Apr 2015 01:14:34 -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 01:14:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2EB0E17F9; Fri, 24 Apr 2015 01:14:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 24 Apr 2015 01:15:03 -0000 Message-Id: <5d6b9ccf7f1940098f6efdf95ef57271@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-446 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-446 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29091c3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29091c3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29091c3f Branch: refs/heads/ignite-gg-9830 Commit: 29091c3fadadb60e1a3c631f8c1a1503c443c12f Parents: b69f37a 0ee2799 Author: avinogradov Authored: Thu Apr 23 11:56:56 2015 +0300 Committer: avinogradov Committed: Thu Apr 23 11:56:56 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(-) ----------------------------------------------------------------------