Skip to content

Commit c6e7df3

Browse files
committed
Re-enable bwc tests now that #29538 has been backported and 6.x intake
build succeeded.
1 parent 6f5d8ca commit c6e7df3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ task verifyVersions {
170170
* the enabled state of every bwc task. It should be set back to true
171171
* after the backport of the backcompat code is complete.
172172
*/
173-
final boolean bwc_tests_enabled = false
174-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/29538" /* place a PR link here when committing bwc changes */
173+
final boolean bwc_tests_enabled = true
174+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
175175
if (bwc_tests_enabled == false) {
176176
if (bwc_tests_disabled_issue.isEmpty()) {
177177
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public GetAliasesRequest(StreamInput in) throws IOException {
4949
indices = in.readStringArray();
5050
aliases = in.readStringArray();
5151
indicesOptions = IndicesOptions.readIndicesOptions(in);
52-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
52+
if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
5353
originalAliases = in.readStringArray();
5454
}
5555
}
@@ -60,7 +60,7 @@ public void writeTo(StreamOutput out) throws IOException {
6060
out.writeStringArray(indices);
6161
out.writeStringArray(aliases);
6262
indicesOptions.writeIndicesOptions(out);
63-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
63+
if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
6464
out.writeStringArray(originalAliases);
6565
}
6666
}

0 commit comments

Comments
 (0)