fixed merge conflict
This commit is contained in:
parent
90e3b50213
commit
27d9ce1143
|
@ -646,7 +646,7 @@ ACTOR Future<Void> monitorLeaderForProxies( Key clusterKey, vector<NetworkAddres
|
|||
|
||||
if (leader.get().first.serializedInfo.size()) {
|
||||
if (g_network->useObjectSerializer()) {
|
||||
ObjectReader reader(leader.get().first.serializedInfo.begin());
|
||||
ObjectReader reader(leader.get().first.serializedInfo.begin(), IncludeVersion());
|
||||
ClusterControllerClientInterface res;
|
||||
reader.deserialize(res);
|
||||
knownLeader->set(res);
|
||||
|
|
Loading…
Reference in New Issue