Merge branch 'feature/searchable-snapshots' into 2020-02-21-freeze-searchable-snapshots

DaveCTurner · DaveCTurner · commit 9e3d4bf37748 · 2020-02-27T13:26:51.000Z
diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/build.gradle b/x-pack/plugin/searchable-snapshots/qa/rest/build.gradle
@@ -19,7 +19,7 @@ testClusters.integTest {
 
 restResources {
   restApi {
-    includeCore 'indices', 'bulk', 'snapshot', 'nodes'
+    includeCore 'indices', 'search', 'bulk', 'snapshot', 'nodes', '_common'
     includeXpack 'searchable_snapshots'
   }
 }
diff --git a/x-pack/plugin/searchable-snapshots/qa/s3/build.gradle b/x-pack/plugin/searchable-snapshots/qa/s3/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
 restResources {
   restApi {
-    includeCore 'indices', 'bulk', 'snapshot', 'nodes'
+    includeCore 'indices', 'search', 'bulk', 'snapshot', 'nodes', '_common'
     includeXpack 'searchable_snapshots'
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ testClusters.integTest {`
`19`	`19`
`20`	`20`	`restResources {`
`21`	`21`	`restApi {`
`22`		`- includeCore 'indices', 'bulk', 'snapshot', 'nodes'`
	`22`	`+ includeCore 'indices', 'search', 'bulk', 'snapshot', 'nodes', '_common'`
`23`	`23`	`includeXpack 'searchable_snapshots'`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies {`
`13`	`13`
`14`	`14`	`restResources {`
`15`	`15`	`restApi {`
`16`		`- includeCore 'indices', 'bulk', 'snapshot', 'nodes'`
	`16`	`+ includeCore 'indices', 'search', 'bulk', 'snapshot', 'nodes', '_common'`
`17`	`17`	`includeXpack 'searchable_snapshots'`
`18`	`18`	`}`
`19`	`19`	`}`