Fix BWC issue for PreSyncedFlushResponse

I misunderstood how the bwc versions works. If we backport to 5.x, we need to backport to all supported 6.*. This commit corrects the BWC versions for PreSyncedFlushResponse. Relates #29103
elastic · Mar 20, 2018 · f938c42 · f938c42
1 parent b4af451
commit f938c42
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
@@ -561,19 +561,11 @@ static final class PreSyncedFlushResponse extends TransportResponse {
         }
 
         boolean includeNumDocs(Version version) {
-            if (version.major == Version.V_5_6_8.major) {
-                return version.onOrAfter(Version.V_5_6_8);
-            } else {
-                return version.onOrAfter(Version.V_6_2_2);
-            }
+            return version.onOrAfter(Version.V_5_6_8);
         }
 
         boolean includeExistingSyncId(Version version) {
-            if (version.major == Version.V_5_6_9.major) {
-                return version.onOrAfter(Version.V_5_6_9);
-            } else {
-                return version.onOrAfter(Version.V_6_3_0);
-            }
+            return version.onOrAfter(Version.V_5_6_9);
         }
 
         @Override