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 62B6B19282 for ; Wed, 20 Apr 2016 10:46:29 +0000 (UTC) Received: (qmail 25854 invoked by uid 500); 20 Apr 2016 10:46:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 25813 invoked by uid 500); 20 Apr 2016 10:46:29 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 25759 invoked by uid 99); 20 Apr 2016 10:46:28 -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 Apr 2016 10:46:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2BEADFF41; Wed, 20 Apr 2016 10:46:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Wed, 20 Apr 2016 10:46:30 -0000 Message-Id: In-Reply-To: <75055a0c1e9e4740b3a8e274d3957a1a@git.apache.org> References: <75055a0c1e9e4740b3a8e274d3957a1a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ignite git commit: Merge branch 'master' into ignite-2004 Merge branch 'master' into ignite-2004 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12c881c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12c881c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12c881c4 Branch: refs/heads/ignite-2004 Commit: 12c881c4296d1df821c9870c8eba7489b8a7102d Parents: 9a456e4 e833eb2 Author: nikolay_tikhonov Authored: Wed Apr 20 13:20:23 2016 +0300 Committer: nikolay_tikhonov Committed: Wed Apr 20 13:20:23 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheOperationFilter.java | 61 ++ .../processors/cache/GridCacheAtomicFuture.java | 5 - .../dht/atomic/GridDhtAtomicCache.java | 107 ++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 - .../GridNearAtomicAbstractUpdateFuture.java | 244 +++++++ .../GridNearAtomicSingleUpdateFuture.java | 645 +++++++++++++++++++ .../dht/atomic/GridNearAtomicUpdateFuture.java | 319 ++------- 7 files changed, 1085 insertions(+), 301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/12c881c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/12c881c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ----------------------------------------------------------------------