Merge branch 'main' into data-stream-mappings-actions

masseyke · web-flow · commit 0d834b5b1728 · 2025-06-25T16:49:20.000-05:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -572,6 +572,9 @@ tests:
 - class: org.elasticsearch.xpack.autoscaling.storage.ReactiveStorageIT
   method: testScaleDuringSplitOrClone
   issue: https://github.com/elastic/elasticsearch/issues/130044
+- class: org.elasticsearch.cluster.metadata.ComposableIndexTemplateTests
+  method: testMergeEmptyMappingsIntoTemplateWithNonEmptySettings
+  issue: https://github.com/elastic/elasticsearch/issues/130050
 
 # Examples:
 #

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,9 @@ tests:`
`572`	`572`	`- class: org.elasticsearch.xpack.autoscaling.storage.ReactiveStorageIT`
`573`	`573`	`method: testScaleDuringSplitOrClone`
`574`	`574`	`issue: https://github.com/elastic/elasticsearch/issues/130044`
	`575`	`+- class: org.elasticsearch.cluster.metadata.ComposableIndexTemplateTests`
	`576`	`+ method: testMergeEmptyMappingsIntoTemplateWithNonEmptySettings`
	`577`	`+ issue: https://github.com/elastic/elasticsearch/issues/130050`
`575`	`578`
`576`	`579`	`# Examples:`
`577`	`580`	`#`