Update PutFollowAction serialization post-backport (#37989)

This commit modifies the `PutFollowRequest` to reflect the fact that active shard functionality has been backported to 6.7.
elastic · Jan 31, 2019 · b8575c6 · b8575c6
1 parent 9923f0f
commit b8575c6
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java b/...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java
@@ -202,8 +202,7 @@ public Request(StreamInput in) throws IOException {
             super(in);
             remoteCluster = in.readString();
             leaderIndex = in.readString();
-            // TODO: Update after backport
-            if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
                 waitForActiveShards(ActiveShardCount.readFrom(in));
             }
             followRequest = new ResumeFollowAction.Request(in);
@@ -214,8 +213,7 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(remoteCluster);
             out.writeString(leaderIndex);
-            // TODO: Update after backport
-            if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
                 waitForActiveShards.writeTo(out);
             }
             followRequest.writeTo(out);