Fix Compilation of RepositoryData

original-brownbear · original-brownbear · commit 464598f35dda · 2019-07-09T13:12:18.000+02:00
Fix conflict from two subsequent PRs removing `incompatibleSnapshots`
diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java
@@ -164,7 +164,7 @@ public RepositoryData withGenId(long newGeneration) {
         if (newGeneration == genId) {
             return this;
         }
-        return new RepositoryData(newGeneration, this.snapshotIds, this.snapshotStates, this.indexSnapshots, incompatibleSnapshotIds);
+        return new RepositoryData(newGeneration, this.snapshotIds, this.snapshotStates, this.indexSnapshots);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public RepositoryData withGenId(long newGeneration) {`
`164`	`164`	`if (newGeneration == genId) {`
`165`	`165`	`return this;`
`166`	`166`	`}`
`167`		`- return new RepositoryData(newGeneration, this.snapshotIds, this.snapshotStates, this.indexSnapshots, incompatibleSnapshotIds);`
	`167`	`+ return new RepositoryData(newGeneration, this.snapshotIds, this.snapshotStates, this.indexSnapshots);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`