You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/13 09:46:37 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4705-2
Repository: ignite
Updated Branches:
refs/heads/ignite-4705-2 8ec5c8e0a -> b900e3a90
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705-2
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
# modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b900e3a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b900e3a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b900e3a9
Branch: refs/heads/ignite-4705-2
Commit: b900e3a9095e7f2c70fc371d4ec2bef83b97df48
Parents: 8ec5c8e
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:46:31 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:46:31 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridClientPartitionTopology.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b900e3a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 1bf8759..a968f6a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -31,8 +31,8 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.processors.affinity.AffinityAssignment;
import org.apache.ignite.internal.managers.discovery.DiscoCache;
+import org.apache.ignite.internal.processors.affinity.AffinityAssignment;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;