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/10/27 07:58:28 UTC
[8/8] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-3478
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39f7ae97
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39f7ae97
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39f7ae97
Branch: refs/heads/ignite-3478
Commit: 39f7ae974a222b63c6a91b1df6cf669266a3e911
Parents: e37dfa3
Author: sboikov <sb...@gridgain.com>
Authored: Fri Oct 27 10:58:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Oct 27 10:58:14 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/managers/discovery/DiscoCache.java | 1 +
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/39f7ae97/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
index 3699a1e..573c075 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
@@ -338,6 +338,7 @@ public class DiscoCache {
ver,
state == null ? this.state : state,
loc,
+ mvccCrd,
rmtNodes,
allNodes,
srvNodes,
http://git-wip-us.apache.org/repos/asf/ignite/blob/39f7ae97/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 716c43b..962d35c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -3084,6 +3084,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
topVer,
discoCache.state(),
discoCache.localNode(),
+ discoCache.mvccCoordinator(),
discoCache.remoteNodes(),
allNodes,
discoCache.serverNodes(),