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 2C37517242 for ; Wed, 20 May 2015 10:02:29 +0000 (UTC) Received: (qmail 38311 invoked by uid 500); 20 May 2015 10:02:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 38278 invoked by uid 500); 20 May 2015 10:02: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 38269 invoked by uid 99); 20 May 2015 10:02:29 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2015 10:02:29 +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 88C3F182753 for ; Wed, 20 May 2015 10:02:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-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 i1ZVZ2a-WaMi for ; Wed, 20 May 2015 10:02:25 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 88FCB262CF for ; Wed, 20 May 2015 10:02:18 +0000 (UTC) Received: (qmail 37707 invoked by uid 99); 20 May 2015 10:02:18 -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; Wed, 20 May 2015 10:02:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66013E01FB; Wed, 20 May 2015 10:02:18 +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: Wed, 20 May 2015 10:02:34 -0000 Message-Id: <77dc2857089845a38929f34dbc51b8a8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/19] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471-2 Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/379c73f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/379c73f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/379c73f6 Branch: refs/heads/ignite-471-2 Commit: 379c73f63ac5920978ed9032fb5efad939fc2b1e Parents: 1f4dddd f9a4dd7 Author: Denis Magda Authored: Wed May 20 08:20:04 2015 +0300 Committer: Denis Magda Committed: Wed May 20 08:20:04 2015 +0300 ---------------------------------------------------------------------- LICENSE | 238 +++++++++++++++++++ LICENSE.txt | 238 ------------------- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- .../internal/GridEventConsumeHandler.java | 26 ++ .../apache/ignite/internal/IgniteKernal.java | 26 +- .../interop/InteropAwareEventFilter.java | 37 +++ .../interop/InteropLocalEventListener.java | 28 +++ .../managers/communication/GridIoManager.java | 6 +- .../GridLifecycleAwareMessageFilter.java | 5 +- .../eventstorage/GridEventStorageManager.java | 24 +- .../processors/cache/GridCacheIoManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareFutureAdapter.java | 9 +- .../near/GridNearTxPrepareResponse.java | 28 ++- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 ++ .../discovery/tcp/TcpDiscoverySpiAdapter.java | 12 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 1 + 31 files changed, 695 insertions(+), 301 deletions(-) ----------------------------------------------------------------------