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 439CE178D7 for ; Mon, 2 Mar 2015 16:30:12 +0000 (UTC) Received: (qmail 34796 invoked by uid 500); 2 Mar 2015 16:30:12 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 34764 invoked by uid 500); 2 Mar 2015 16:30:12 -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 34753 invoked by uid 99); 2 Mar 2015 16:30:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 16:30:12 +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; Mon, 02 Mar 2015 16:29:50 +0000 Received: (qmail 33884 invoked by uid 99); 2 Mar 2015 16:29:47 -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, 02 Mar 2015 16:29:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40F70E0FC4; Mon, 2 Mar 2015 16:29:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Mar 2015 16:29:56 -0000 Message-Id: <14e231a79aee442f827d5b7fe9c696ea@git.apache.org> In-Reply-To: <06ea0f2075f74ae5834f083172f16dc0@git.apache.org> References: <06ea0f2075f74ae5834f083172f16dc0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-136 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-136 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d0f1b8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d0f1b8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d0f1b8b Branch: refs/heads/ignite-368 Commit: 8d0f1b8b388044374882cbf2baba2bbcd6854bc2 Parents: 23338a4 dd51ef5 Author: sboikov Authored: Wed Feb 25 09:15:19 2015 +0300 Committer: sboikov Committed: Wed Feb 25 09:15:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 28 +- .../processors/cache/GridCacheMapEntry.java | 562 +++++++++++-------- .../GridDistributedTxRemoteAdapter.java | 66 +-- .../dht/atomic/GridDhtAtomicCache.java | 44 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 84 +-- .../distributed/near/GridNearAtomicCache.java | 3 - .../cache/transactions/IgniteTxAdapter.java | 58 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 48 +- .../cache/version/GridCacheVersion.java | 3 +- .../GridCacheVersionConflictContext.java | 35 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 6 +- .../core/src/main/resources/ignite.properties | 2 +- .../near/IgniteCacheNearReadCommittedTest.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../client/hadoop/GridHadoopClientProtocol.java | 3 +- .../hadoop/GridHadoopDefaultJobInfo.java | 5 +- 18 files changed, 535 insertions(+), 432 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d0f1b8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d0f1b8b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------