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 45E3C180A4 for ; Mon, 23 Nov 2015 14:02:13 +0000 (UTC) Received: (qmail 83384 invoked by uid 500); 23 Nov 2015 14:02:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 83290 invoked by uid 500); 23 Nov 2015 14:02:13 -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 83233 invoked by uid 99); 23 Nov 2015 14:02:13 -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; Mon, 23 Nov 2015 14:02:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0E40BE07BA; Mon, 23 Nov 2015 14:02:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Mon, 23 Nov 2015 14:02:22 -0000 Message-Id: <036c0a34e44e43ff9b47774a45548ca8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/17] ignite git commit: Merge branch ignite-1.5-tx-futs-opts into ignite-1.5 Merge branch ignite-1.5-tx-futs-opts into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/07f5a62e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/07f5a62e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/07f5a62e Branch: refs/heads/ignite-1282 Commit: 07f5a62ec8e496a9a43e802f3f7bf5efc1dc2f9a Parents: 15877a8 388c857 Author: Alexey Goncharuk Authored: Mon Nov 23 09:44:43 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Nov 23 09:44:43 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtGetFuture.java | 24 +- .../distributed/dht/GridDhtLockFuture.java | 77 +- .../colocated/GridDhtColocatedLockFuture.java | 595 ++++++++------- .../distributed/near/GridNearLockFuture.java | 739 ++++++++++--------- .../distributed/near/GridNearLockMapping.java | 6 +- 5 files changed, 751 insertions(+), 690 deletions(-) ----------------------------------------------------------------------