Merge branch 'master' into feature/ml-inference-add-description-api

elastic · Sep 16, 2020 · 4e4a198 · 4e4a198
2 parents 29a35a9 + 7bb81be
commit 4e4a198
Show file tree

Hide file tree

Showing 231 changed files with 2,433 additions and 2,571 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.7.0-snapshot-61ea26a
+lucene            = 8.7.0-snapshot-b313618cc1d
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 14.0.1+7

diff --git a/...high-level/src/main/java/org/elasticsearch/client/ml/GetTrainedModelsMetadataRequest.java b/...high-level/src/main/java/org/elasticsearch/client/ml/GetTrainedModelsMetadataRequest.java
diff --git a/...igh-level/src/main/java/org/elasticsearch/client/ml/GetTrainedModelsMetadataResponse.java b/...igh-level/src/main/java/org/elasticsearch/client/ml/GetTrainedModelsMetadataResponse.java
diff --git a/...ava/org/elasticsearch/client/ml/inference/trainedmodel/metadata/TrainedModelMetadata.java b/...ava/org/elasticsearch/client/ml/inference/trainedmodel/metadata/TrainedModelMetadata.java
diff --git a/...level/src/test/java/org/elasticsearch/client/ml/GetTrainedModelsMetadataRequestTests.java b/...level/src/test/java/org/elasticsearch/client/ml/GetTrainedModelsMetadataRequestTests.java
diff --git a/...rg/elasticsearch/client/ml/inference/trainedmodel/metadata/TrainedModelMetadataTests.java b/...rg/elasticsearch/client/ml/inference/trainedmodel/metadata/TrainedModelMetadataTests.java
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -54,7 +54,6 @@ testClusters.integTest {
     setting 'indices.lifecycle.history_index_enabled', 'false'
     if (BuildParams.isSnapshotBuild() == false) {
       systemProperty 'es.autoscaling_feature_flag_registered', 'true'
-      systemProperty 'es.searchable_snapshots_feature_enabled', 'true'
     }
     setting 'xpack.autoscaling.enabled', 'true'
     setting 'xpack.eql.enabled', 'true'