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 F008117CAE for ; Thu, 30 Apr 2015 15:59:11 +0000 (UTC) Received: (qmail 94556 invoked by uid 500); 30 Apr 2015 15:59:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 94525 invoked by uid 500); 30 Apr 2015 15:59:11 -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 94516 invoked by uid 99); 30 Apr 2015 15:59:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 15:59:11 +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, 30 Apr 2015 15:59:07 +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 2F4F1262C1 for ; Thu, 30 Apr 2015 15:58:47 +0000 (UTC) Received: (qmail 91366 invoked by uid 99); 30 Apr 2015 15:58: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, 30 Apr 2015 15:58:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EF020E3A56; Thu, 30 Apr 2015 15:58:46 +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, 30 Apr 2015 15:58:52 -0000 Message-Id: <1a908f48074745cfbce4268976a03c2f@git.apache.org> In-Reply-To: <33e1235b1af9410e906c8cdca8fc3f6d@git.apache.org> References: <33e1235b1af9410e906c8cdca8fc3f6d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/50] incubator-ignite git commit: Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ae249e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ae249e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ae249e1 Branch: refs/heads/ignite-471 Commit: 0ae249e11b9e1909199c0ef927036606d9638833 Parents: 366b332 19bd611 Author: Andrey Authored: Tue Apr 28 15:38:24 2015 +0700 Committer: Andrey Committed: Tue Apr 28 15:38:24 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridJobContextImpl.java | 7 +++---- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 10 ++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) ----------------------------------------------------------------------