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 E3BE118443 for ; Tue, 16 Jun 2015 07:00:30 +0000 (UTC) Received: (qmail 61668 invoked by uid 500); 16 Jun 2015 07:00:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 61634 invoked by uid 500); 16 Jun 2015 07:00:29 -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 61585 invoked by uid 99); 16 Jun 2015 07:00:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 07:00:29 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,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; Tue, 16 Jun 2015 06:58:18 +0000 Received: (qmail 54370 invoked by uid 99); 16 Jun 2015 07:00:05 -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, 16 Jun 2015 07:00:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5819E3609; Tue, 16 Jun 2015 07:00:04 +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: Tue, 16 Jun 2015 07:00:05 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-1009-v4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-1009-v4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd43ff7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd43ff7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd43ff7c Branch: refs/heads/ignite-sprint-6 Commit: cd43ff7c4f9db4dc29572bd4dace4443b0373392 Parents: 7f97ec7 2707194 Author: sboikov Authored: Fri Jun 12 18:28:23 2015 +0300 Committer: sboikov Committed: Fri Jun 12 18:28:23 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 +++ .../ignite/internal/GridKernalContextImpl.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 21 +++++- .../internal/MarshallerContextAdapter.java | 18 ++++- .../ignite/internal/MarshallerContextImpl.java | 14 +++- .../GridClientOptimizedMarshaller.java | 5 ++ .../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 - .../plugin/IgnitePluginProcessor.java | 16 +--- .../messages/GridQueryNextPageResponse.java | 1 + .../cache/GridCachePutAllFailoverSelfTest.java | 5 -- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +++- .../dht/GridCacheColocatedFailoverSelfTest.java | 5 -- .../GridCachePartitionedFailoverSelfTest.java | 5 -- .../GridCacheReplicatedFailoverSelfTest.java | 5 -- .../DataStreamProcessorSelfTest.java | 3 +- .../marshaller/MarshallerContextTestImpl.java | 18 +++++ .../junits/GridTestKernalContext.java | 1 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 18 ++++- 40 files changed, 464 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd43ff7c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ----------------------------------------------------------------------