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 C11DE10FD6 for ; Fri, 10 Apr 2015 07:27:30 +0000 (UTC) Received: (qmail 16464 invoked by uid 500); 10 Apr 2015 07:27:27 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 16434 invoked by uid 500); 10 Apr 2015 07:27:27 -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 16425 invoked by uid 99); 10 Apr 2015 07:27:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 07:27:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Apr 2015 07:27:26 +0000 Received: (qmail 15842 invoked by uid 99); 10 Apr 2015 07:27:06 -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, 10 Apr 2015 07:27:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42AC8E03CE; Fri, 10 Apr 2015 07:27:06 +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: Fri, 10 Apr 2015 07:27:21 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/27] incubator-ignite git commit: Merge branch ignite-701 into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch ignite-701 into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/845787cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/845787cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/845787cd Branch: refs/heads/ignite-692 Commit: 845787cdc266ba1db1aaf3f61f4ee9acd97168ee Parents: bad0161 a3fe2e4 Author: Alexey Goncharuk Authored: Thu Apr 9 18:07:17 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Apr 9 18:07:17 2015 -0700 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLockFuture.java | 3 ++- .../ignite/GridCacheAffinityBackupsSelfTest.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) ----------------------------------------------------------------------