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 A8F5618897 for ; Fri, 12 Jun 2015 11:55:02 +0000 (UTC) Received: (qmail 60520 invoked by uid 500); 12 Jun 2015 11:54:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 60490 invoked by uid 500); 12 Jun 2015 11:54:59 -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 60481 invoked by uid 99); 12 Jun 2015 11:54:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 11:54:59 +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, 12 Jun 2015 11:52:49 +0000 Received: (qmail 60411 invoked by uid 99); 12 Jun 2015 11:54:35 -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, 12 Jun 2015 11:54:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B9C35E04B0; Fri, 12 Jun 2015 11:54:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 12 Jun 2015 11:54:37 -0000 Message-Id: <275f712680334f5d8f3342b5a7a76b8b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f20d124 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f20d124 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f20d124 Branch: refs/heads/ignite-gg-10411 Commit: 3f20d124d4cf3c2f9eccacf8b6f6cb83fa3c880c Parents: f533cff 83a1986 Author: ptupitsyn Authored: Fri Jun 12 14:54:21 2015 +0300 Committer: ptupitsyn Committed: Fri Jun 12 14:54:21 2015 +0300 ---------------------------------------------------------------------- .../distributed/GridCacheTxRecoveryRequest.java | 26 +++---- .../GridCacheTxRecoveryResponse.java | 14 ++-- .../distributed/GridDistributedBaseMessage.java | 77 +------------------- .../distributed/GridDistributedLockRequest.java | 54 +++++++------- .../GridDistributedLockResponse.java | 14 ++-- .../GridDistributedTxFinishRequest.java | 46 ++++++------ .../GridDistributedTxPrepareRequest.java | 62 ++++++++-------- .../GridDistributedTxPrepareResponse.java | 64 +--------------- .../GridDistributedUnlockRequest.java | 6 +- .../distributed/dht/GridDhtLockRequest.java | 72 ++++++++++++++---- .../distributed/dht/GridDhtLockResponse.java | 18 ++--- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +++++----- .../dht/GridDhtTxPrepareRequest.java | 54 +++++++------- .../dht/GridDhtTxPrepareResponse.java | 22 +++--- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../distributed/near/GridNearLockRequest.java | 58 +++++++-------- .../distributed/near/GridNearLockResponse.java | 26 +++---- .../near/GridNearTxFinishRequest.java | 26 +++---- .../near/GridNearTxPrepareRequest.java | 50 ++++++------- .../near/GridNearTxPrepareResponse.java | 46 ++++++------ .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 3 - .../messages/GridQueryNextPageResponse.java | 1 + 23 files changed, 348 insertions(+), 437 deletions(-) ----------------------------------------------------------------------