From d367984724934ac036c1fa42e09effd0710b8cc1 Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Wed, 11 Mar 2020 07:39:24 +0100 Subject: [PATCH] Reenable BwC Tests after #53372 (#53381) Reenabling BwC Tests now that #53372 has been merged. --- build.gradle | 4 ++-- .../action/admin/indices/forcemerge/ForceMergeRequest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1aab34f629ac..8176f88dab74 100644 --- a/build.gradle +++ b/build.gradle @@ -220,8 +220,8 @@ task verifyVersions { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false -final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/53372" /* place a PR link here when committing bwc changes */ +boolean bwc_tests_enabled = true +final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false") diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java index bc7c782e8e86..a6299cbee1ab 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java @@ -56,7 +56,7 @@ public static final class Defaults { private boolean onlyExpungeDeletes = Defaults.ONLY_EXPUNGE_DELETES; private boolean flush = Defaults.FLUSH; - private static final Version FORCE_MERGE_UUID_VERSION = Version.V_8_0_0; + private static final Version FORCE_MERGE_UUID_VERSION = Version.V_7_7_0; /** * Force merge UUID to store in the live commit data of a shard under