From 6ca5e80ed21e9a9c7dc5f0957c74d971b5fb26b0 Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Tue, 29 Jun 2021 15:18:16 +0200 Subject: [PATCH] Reenable BwC Tests after #74676 Now that #74676 has been merged, reenable BwC tests. --- build.gradle | 4 ++-- .../admin/cluster/snapshots/get/GetSnapshotsRequest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 50cce2414d96f..c9808547bf2d0 100644 --- a/build.gradle +++ b/build.gradle @@ -117,9 +117,9 @@ tasks.register("verifyVersions") { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false +boolean bwc_tests_enabled = true // place a PR link here when committing bwc changes: -String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/74676" +String bwc_tests_disabled_issue = "" /* * FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a * JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java index e0b51ea27cbc2..dc18e183323a0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java @@ -39,9 +39,9 @@ public class GetSnapshotsRequest extends MasterNodeRequest public static final String CURRENT_SNAPSHOT = "_current"; public static final boolean DEFAULT_VERBOSE_MODE = true; - public static final Version MULTIPLE_REPOSITORIES_SUPPORT_ADDED = Version.V_8_0_0; + public static final Version MULTIPLE_REPOSITORIES_SUPPORT_ADDED = Version.V_7_14_0; - public static final Version PAGINATED_GET_SNAPSHOTS_VERSION = Version.V_8_0_0; + public static final Version PAGINATED_GET_SNAPSHOTS_VERSION = Version.V_7_14_0; public static final int NO_LIMIT = -1;