Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 897C9200B61 for ; Tue, 9 Aug 2016 09:45:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 86BB3160AB9; Tue, 9 Aug 2016 07:45:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 00FF4160AA5 for ; Tue, 9 Aug 2016 09:45:43 +0200 (CEST) Received: (qmail 26401 invoked by uid 500); 9 Aug 2016 07:45:43 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 26327 invoked by uid 99); 9 Aug 2016 07:45:43 -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; Tue, 09 Aug 2016 07:45:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0AB59E78A1; Tue, 9 Aug 2016 07:45:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Tue, 09 Aug 2016 07:45:44 -0000 Message-Id: In-Reply-To: <53dac2962496479d8ee65b09e615123e@git.apache.org> References: <53dac2962496479d8ee65b09e615123e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] ignite git commit: Merge branch 'ignite-2545' of https://github.com/AMashenkov/ignite into ignite-2545 archived-at: Tue, 09 Aug 2016 07:45:44 -0000 Merge branch 'ignite-2545' of https://github.com/AMashenkov/ignite into ignite-2545 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebe52afc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebe52afc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebe52afc Branch: refs/heads/ignite-2545 Commit: ebe52afc0b2066b31537433764f4df3c7da1ea46 Parents: 789b2f3 07186d2 Author: vozerov-gridgain Authored: Tue Aug 9 10:25:10 2016 +0300 Committer: vozerov-gridgain Committed: Tue Aug 9 10:25:10 2016 +0300 ---------------------------------------------------------------------- .../distributed/GridCacheTxRecoveryFuture.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../colocated/GridDhtColocatedLockFuture.java | 6 +- .../distributed/near/GridNearLockFuture.java | 6 +- ...arOptimisticSerializableTxPrepareFuture.java | 6 +- .../near/GridNearOptimisticTxPrepareFuture.java | 6 +- .../GridNearPessimisticTxPrepareFuture.java | 6 +- .../near/GridNearTxFinishFuture.java | 6 +- .../util/future/GridCompoundFuture.java | 88 ++++++++++++++++---- 10 files changed, 97 insertions(+), 45 deletions(-) ----------------------------------------------------------------------