Skip to content

Commit 3c7b96b

Browse files
authored
Merge branch 'main' into lucene_snapshot_10_1
2 parents 7626552 + 971a794 commit 3c7b96b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

docs/reference/indices/index-templates.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ applying the templates, do one or more of the following:
6161
6262
- Use a non-overlapping index pattern.
6363
64-
- Assign templates with an overlapping pattern a `priority` higher than `200`.
64+
- Assign templates with an overlapping pattern a `priority` higher than `500`.
6565
For example, if you don't use {fleet} or {agent} and want to create a template
6666
for the `logs-*` index pattern, assign your template a priority of `500`. This
6767
ensures your template is applied instead of the built-in template for

muted-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ tests:
241241
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
242242
method: test {p0=ml/data_frame_analytics_cat_apis/Test cat data frame analytics all jobs with header}
243243
issue: https://github.com/elastic/elasticsearch/issues/119332
244-
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
245-
method: test {lookup-join.MvJoinKeyOnTheDataNode ASYNC}
246-
issue: https://github.com/elastic/elasticsearch/issues/119179
247244
- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
248245
issue: https://github.com/elastic/elasticsearch/issues/119191
249246
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
@@ -252,12 +249,15 @@ tests:
252249
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
253250
method: testMatchAllQuery
254251
issue: https://github.com/elastic/elasticsearch/issues/119432
255-
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
256-
method: test {lookup-join.MvJoinKeyOnTheDataNode SYNC}
257-
issue: https://github.com/elastic/elasticsearch/issues/119446
258252
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
259253
method: testTermsQuery
260254
issue: https://github.com/elastic/elasticsearch/issues/119486
255+
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
256+
method: test {p0=transform/transforms_start_stop/Test start/stop/start transform}
257+
issue: https://github.com/elastic/elasticsearch/issues/119508
258+
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
259+
method: testEsqlSource
260+
issue: https://github.com/elastic/elasticsearch/issues/119510
261261

262262
# Examples:
263263
#

x-pack/plugin/esql/qa/testFixtures/src/main/resources/lookup-join.csv-spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ FROM employees
419419
| EVAL language_code = emp_no % 10
420420
| LOOKUP JOIN languages_lookup_non_unique_key ON language_code
421421
| SORT emp_no
422+
| EVAL language_name = MV_SORT(language_name)
422423
| KEEP emp_no, language_code, language_name
423424
;
424425

0 commit comments

Comments
 (0)