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 C0BF0189A7 for ; Thu, 23 Apr 2015 10:37:25 +0000 (UTC) Received: (qmail 35876 invoked by uid 500); 23 Apr 2015 10:37:25 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35847 invoked by uid 500); 23 Apr 2015 10:37:25 -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 35838 invoked by uid 99); 23 Apr 2015 10:37:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 10:37:25 +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.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 10:37:21 +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 BC18F24F3B for ; Thu, 23 Apr 2015 10:36:47 +0000 (UTC) Received: (qmail 35395 invoked by uid 99); 23 Apr 2015 10:36:47 -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 10:36:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55341E051A; Thu, 23 Apr 2015 10:36:47 +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 10:36:49 -0000 Message-Id: <680c5a5c3ccf49a4a4e9568a9bbad984@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-787' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-787' 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/86cc1ade Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86cc1ade Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86cc1ade Branch: refs/heads/ignite-446 Commit: 86cc1ade3bc56a8ba7ae2efcce3e1876c406ba87 Parents: 8e31b7c dfb119f Author: sboikov Authored: Thu Apr 23 09:07:14 2015 +0300 Committer: sboikov Committed: Thu Apr 23 09:07:14 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAffinityManager.java | 12 ------- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++++++++++++++++++ .../IgniteCacheFailoverTestSuite.java | 3 +- 9 files changed, 43 insertions(+), 19 deletions(-) ----------------------------------------------------------------------