Skip to content

Commit 7451b56

Browse files
authored
Merge branch 'main' into reenable_dio
2 parents 13ef78c + 9334f34 commit 7451b56

File tree

63 files changed

+2697
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2697
-702
lines changed

build-tools-internal/src/main/resources/forbidden/es-server-signatures.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ org.elasticsearch.cluster.ClusterFeatures#clusterHasFeature(org.elasticsearch.cl
160160

161161
@defaultMessage Do not construct this records outside the source files they are declared in
162162
org.elasticsearch.cluster.SnapshotsInProgress$ShardSnapshotStatus#<init>(java.lang.String, org.elasticsearch.cluster.SnapshotsInProgress$ShardState, org.elasticsearch.repositories.ShardGeneration, java.lang.String, org.elasticsearch.repositories.ShardSnapshotResult)
163-
org.elasticsearch.cluster.SnapshotDeletionsInProgress$Entry#<init>(java.lang.String, java.util.List, long, long, org.elasticsearch.cluster.SnapshotDeletionsInProgress$State, java.lang.String)
163+
org.elasticsearch.cluster.SnapshotDeletionsInProgress$Entry#<init>(org.elasticsearch.cluster.metadata.ProjectId, java.lang.String, java.util.List, long, long, org.elasticsearch.cluster.SnapshotDeletionsInProgress$State, java.lang.String)
164164

165165
@defaultMessage Use a Thread constructor with a name, anonymous threads are more difficult to debug
166166
java.lang.Thread#<init>(java.lang.Runnable)

docs/changelog/128635.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 128635
2+
summary: Add `state` query param to Get snapshots API
3+
area: Snapshot/Restore
4+
type: enhancement
5+
issues:
6+
- 97446

docs/changelog/129170.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129170
2+
summary: Add Support for LIKE (LIST)
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/reference/query-languages/esql/_snippets/operators/detailedDescription/like.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ ROW message = "foo * bar"
1010
```
1111

1212

13+
```esql
14+
ROW message = "foobar"
15+
| WHERE message like ("foo*", "bar?")
16+
```
17+
18+
1319
To reduce the overhead of escaping, we suggest using triple quotes strings `"""`
1420

1521
```esql

docs/reference/query-languages/esql/kibana/definition/operators/like.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/definition/operators/not like.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/docs/operators/like.md

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/docs/operators/not like.md

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/data-streams/src/test/java/org/elasticsearch/datastreams/LookAHeadTimeTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ public void testLookAheadTimeSettingHigherThanTimeSeriesPollIntervalSetting() {
118118
updateIndexSettings(indexSettings);
119119
}
120120

121-
private void updateClusterSettings(Settings settings) {
121+
@Override
122+
protected void updateClusterSettings(Settings settings) {
122123
clusterAdmin().updateSettings(
123124
new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(settings)
124125
).actionGet();

muted-tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,12 @@ tests:
559559
- class: org.elasticsearch.xpack.security.PermissionsIT
560560
method: testWhenUserLimitedByOnlyAliasOfIndexCanWriteToIndexWhichWasRolledoverByILMPolicy
561561
issue: https://github.com/elastic/elasticsearch/issues/129481
562+
- class: org.elasticsearch.xpack.ilm.TimeSeriesLifecycleActionsIT
563+
method: testFullPolicy
564+
issue: https://github.com/elastic/elasticsearch/issues/129510
565+
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
566+
method: test {knn-function.KnnSearchWithKOption SYNC}
567+
issue: https://github.com/elastic/elasticsearch/issues/129512
562568

563569
# Examples:
564570
#

0 commit comments

Comments
 (0)