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 031B51746A for ; Thu, 23 Apr 2015 18:13:53 +0000 (UTC) Received: (qmail 70559 invoked by uid 500); 23 Apr 2015 18:13:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70492 invoked by uid 500); 23 Apr 2015 18:13:52 -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 70476 invoked by uid 99); 23 Apr 2015 18:13:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 18:13:52 +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: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 18:13:47 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 8841743EA6 for ; Thu, 23 Apr 2015 18:12:58 +0000 (UTC) Received: (qmail 66808 invoked by uid 99); 23 Apr 2015 18:12:58 -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, 23 Apr 2015 18:12:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D84AE17E1; Thu, 23 Apr 2015 18:12:58 +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, 23 Apr 2015 18:13:28 -0000 Message-Id: In-Reply-To: <9b44ab4891024f179455fbffde8506a7@git.apache.org> References: <9b44ab4891024f179455fbffde8506a7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/43] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-656' into ignite-656 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-656' into ignite-656 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5c5cc9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5c5cc9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5c5cc9d Branch: refs/heads/ignite-sprint-4 Commit: f5c5cc9d89ee201ecf430625f87512fb5d1781c1 Parents: ce41de7 924580e Author: sboikov Authored: Wed Apr 22 16:57:18 2015 +0300 Committer: sboikov Committed: Wed Apr 22 16:57:18 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 5 +- .../dht/colocated/GridDhtColocatedCache.java | 7 +- .../near/GridNearTransactionalCache.java | 11 ++-- .../transactions/IgniteTxLocalAdapter.java | 69 +++++++++++++------- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 + 8 files changed, 70 insertions(+), 40 deletions(-) ----------------------------------------------------------------------