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 934B51821B for ; Fri, 12 Jun 2015 15:43:00 +0000 (UTC) Received: (qmail 87501 invoked by uid 500); 12 Jun 2015 15:43:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87468 invoked by uid 500); 12 Jun 2015 15:43:00 -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 87456 invoked by uid 99); 12 Jun 2015 15:43:00 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 15:43:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DAAC618221F for ; Fri, 12 Jun 2015 15:42:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id SSO1cfmnotex for ; Fri, 12 Jun 2015 15:42:47 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id B9ED9253F9 for ; Fri, 12 Jun 2015 15:42:45 +0000 (UTC) Received: (qmail 86521 invoked by uid 99); 12 Jun 2015 15:42:44 -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 15:42:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 222A5E17FC; Fri, 12 Jun 2015 15:42:44 +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: Fri, 12 Jun 2015 15:42:50 -0000 Message-Id: <2952c4f189674adbb4aa7e8c5c74df4e@git.apache.org> In-Reply-To: <5b9e0ae9b5bf41ca83d1e9bcdcdee505@git.apache.org> References: <5b9e0ae9b5bf41ca83d1e9bcdcdee505@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423 Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/893bef2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/893bef2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/893bef2c Branch: refs/heads/ignite-gg-10123 Commit: 893bef2cf381586ff3b319a3dfedfb24fe8b8cbf Parents: 3e74a6d c233aa2 Author: iveselovskiy Authored: Fri Jun 12 15:53:51 2015 +0300 Committer: iveselovskiy Committed: Fri Jun 12 15:53:51 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 + .../DataStreamProcessorSelfTest.java | 3 +- .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- 25 files changed, 351 insertions(+), 439 deletions(-) ----------------------------------------------------------------------