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 7E2BF17B01 for ; Thu, 23 Apr 2015 16:06:26 +0000 (UTC) Received: (qmail 6805 invoked by uid 500); 23 Apr 2015 16:06:17 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 6774 invoked by uid 500); 23 Apr 2015 16:06:17 -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 6764 invoked by uid 99); 23 Apr 2015 16:06:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 16:06:16 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of root@apache.org designates 54.76.25.247 as permitted sender) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 16:05:52 +0000 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 B87372806D for ; Thu, 23 Apr 2015 16:01:53 +0000 (UTC) Received: (qmail 86107 invoked by uid 99); 23 Apr 2015 16:01:50 -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; Thu, 23 Apr 2015 16:01:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DCF79E17BD; Thu, 23 Apr 2015 16:01:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Apr 2015 16:02:27 -0000 Message-Id: <139c80a8e2a6451f85e2de9f3422f845@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/46] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6132bba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6132bba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6132bba Branch: refs/heads/ignite-286 Commit: a6132bbade24683a0b5360e8c34a8482208eaa6e Parents: 8b7364b a09cc08 Author: AKuznetsov Authored: Thu Apr 23 17:17:44 2015 +0700 Committer: AKuznetsov Committed: Thu Apr 23 17:17:44 2015 +0700 ---------------------------------------------------------------------- .../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 ++++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 2 +- .../IgniteCacheFailoverTestSuite.java | 3 +- .../ignite/internal/GridFactorySelfTest.java | 3 +- 13 files changed, 61 insertions(+), 25 deletions(-) ----------------------------------------------------------------------