Merge branch 'main' into fix_type_ds_autosharding

nicktindall · web-flow · commit 01364b2e1854 · 2025-06-26T17:03:11.000+10:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -575,6 +575,9 @@ tests:
 - class: org.elasticsearch.cluster.metadata.ComposableIndexTemplateTests
   method: testMergeEmptyMappingsIntoTemplateWithNonEmptySettings
   issue: https://github.com/elastic/elasticsearch/issues/130050
+- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
+  method: test
+  issue: https://github.com/elastic/elasticsearch/issues/130067
 
 # Examples:
 #

Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,9 @@ tests:`
`575`	`575`	`- class: org.elasticsearch.cluster.metadata.ComposableIndexTemplateTests`
`576`	`576`	`method: testMergeEmptyMappingsIntoTemplateWithNonEmptySettings`
`577`	`577`	`issue: https://github.com/elastic/elasticsearch/issues/130050`
	`578`	`+- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT`
	`579`	`+ method: test`
	`580`	`+ issue: https://github.com/elastic/elasticsearch/issues/130067`
`578`	`581`
`579`	`582`	`# Examples:`
`580`	`583`	`#`