Skip to content

Commit 088391d

Browse files
authored
Merge branch '8.19' into update-8.19-apm-data-resource-version
2 parents ba56855 + b17d583 commit 088391d

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

docs/reference/search/search-your-data/search-across-clusters.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ The following APIs support {ccs}:
1919
* <<search-field-caps,Field capabilities>>
2020
* {painless}/painless-execute-api.html[Painless execute API]
2121
* <<indices-resolve-index-api,Resolve Index API>>
22+
* <<search-vector-tile-api,Vector tile search>>
23+
* <<esql-cross-clusters,ES|QL>>
2224
* experimental:[] <<eql-search-api,EQL search>>
2325
* experimental:[] <<sql-search-api,SQL search>>
24-
* experimental:[] <<search-vector-tile-api,Vector tile search>>
25-
* <<esql-cross-clusters,ES|QL>>
2626

2727
[discrete]
2828
=== Prerequisites

modules/data-streams/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,7 @@ tasks.named("yamlRestTestV7CompatTransform").configure({ task ->
8181
task.skipTest("data_stream/210_rollover_failure_store/Roll over a data stream's failure store without conditions", "Rolling over a data stream using target_failure_store is no longer supported.")
8282
task.skipTest("data_stream/240_failure_store_info/Get failure store info from explicitly enabled failure store and disabled lifecycle", "failure store lifecycle is not using anymore the data stream lifecycle")
8383
})
84+
85+
artifacts {
86+
restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test"))
87+
}

test/framework/src/main/java/org/elasticsearch/cli/CommandTestCase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.cli;
1111

1212
import org.elasticsearch.test.ESTestCase;
13+
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
1314
import org.hamcrest.Matcher;
1415
import org.junit.Before;
1516

@@ -25,6 +26,7 @@
2526
/**
2627
* A base test case for cli tools.
2728
*/
29+
@WithoutEntitlements // CLI tools don't run with entitlements enforced
2830
public abstract class CommandTestCase extends ESTestCase {
2931

3032
/** The terminal that execute uses */

x-pack/rest-resources-zip/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
freeTests project(path: ':rest-api-spec', configuration: 'restTests')
2121
freeTests project(path: ':modules:aggregations', configuration: 'restTests')
2222
freeTests project(path: ':modules:analysis-common', configuration: 'restTests')
23+
freeTests project(path: ':modules:data-streams', configuration: 'restTests')
2324
freeTests project(path: ':modules:ingest-geoip', configuration: 'restTests')
2425
compatApis project(path: ':rest-api-spec', configuration: 'restCompatSpecs')
2526
compatApis project(path: ':x-pack:plugin', configuration: 'restCompatSpecs')

0 commit comments

Comments
 (0)