ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/50] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Date Thu, 13 Jul 2017 14:35:36 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80c4ddb0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80c4ddb0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80c4ddb0

Branch: refs/heads/ignite-5578
Commit: 80c4ddb0108a495d66f13f46b9db0690cb525b27
Parents: d8e5f6b
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Jul 11 12:49:57 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Jul 11 12:49:57 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePartitionExchangeManager.java         | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/80c4ddb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index cfa1d87..7bfcd6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -102,6 +102,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.util.worker.GridWorker;
 import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteProductVersion;
 import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.thread.IgniteThread;
 import org.jetbrains.annotations.Nullable;


Mime
View raw message