ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [3/3] ignite git commit: Resolved conflicts.
Date Wed, 20 Apr 2016 07:14:43 GMT
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 <vozerov@gridgain.com>
Authored: Wed Apr 20 10:14:35 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
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;
 


Mime
View raw message