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 2D20818A23 for ; Wed, 20 Apr 2016 07:14:42 +0000 (UTC) Received: (qmail 75860 invoked by uid 500); 20 Apr 2016 07:14:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 75785 invoked by uid 500); 20 Apr 2016 07:14:41 -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 75721 invoked by uid 99); 20 Apr 2016 07:14:41 -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 07:14:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6AA9DFE16; Wed, 20 Apr 2016 07:14:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 20 Apr 2016 07:14:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ignite git commit: Resolved conflicts. Resolved conflicts. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/586ac9a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/586ac9a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/586ac9a7 Branch: refs/heads/ignite-2523-1 Commit: 586ac9a758c5d8358218f565fe5ee7d0fdf15aec Parents: e43db04 Author: vozerov-gridgain Authored: Wed Apr 20 10:14:35 2016 +0300 Committer: vozerov-gridgain Committed: Wed Apr 20 10:14:35 2016 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/586ac9a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 5428209..2bebc1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -48,6 +48,7 @@ import javax.cache.expiry.ExpiryPolicy; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.UUID;