Fix compil after backport

Relates #31066
elastic · Jun 5, 2018 · 86e5f00 · 86e5f00
1 parent 50835b7
commit 86e5f00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml
@@ -66,7 +66,7 @@ setup:
 ---
 "search index prefixes with span_multi":
   - skip:
-      version: " - 6.99.99"
+      version: " - 6.2.99"
       reason: span_multi throws an exception with prefix fields on < versions
 
   - do:

diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java
@@ -59,7 +59,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws
             .endObject().endObject().endObject();
 
         mapperService.merge("_doc",
-            new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE);
+            new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE, true);
     }
 
     @Override