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 F2B0517A45 for ; Wed, 22 Apr 2015 04:02:19 +0000 (UTC) Received: (qmail 78911 invoked by uid 500); 22 Apr 2015 04:02:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 78840 invoked by uid 500); 22 Apr 2015 04:02:19 -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 78688 invoked by uid 99); 22 Apr 2015 04:02:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 04:02:19 +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: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 04:01:54 +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 3C56525F8F for ; Wed, 22 Apr 2015 04:01:50 +0000 (UTC) Received: (qmail 75783 invoked by uid 99); 22 Apr 2015 04:01:48 -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; Wed, 22 Apr 2015 04:01:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7888FE0E57; Wed, 22 Apr 2015 04:01:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 22 Apr 2015 04:02:05 -0000 Message-Id: <3b4c1481bcfe4447ae89e86d25ac349c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [18/24] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/6304fabf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6304fabf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6304fabf Branch: refs/heads/ignite-748 Commit: 6304fabf3db36f9585dc3bb2617357a669fc3712 Parents: 38de90c f9156da Author: ivasilinets Authored: Tue Apr 21 15:47:07 2015 +0300 Committer: ivasilinets Committed: Tue Apr 21 15:47:07 2015 +0300 ---------------------------------------------------------------------- .../dht/GridDhtAffinityAssignmentResponse.java | 21 +++++++++++++++++++- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../IgniteCacheFullApiSelfTestSuite.java | 15 +++++++------- 4 files changed, 29 insertions(+), 11 deletions(-) ----------------------------------------------------------------------