Skip to content

Commit e2d9007

Browse files
committed
Merge remote-tracking branch 'es/9.1' into backport_9fd8
2 parents 13f7983 + 1f1b8e7 commit e2d9007

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,9 @@ tests:
551551
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlI
552552
method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version}
553553
issue: https://github.com/elastic/elasticsearch/issues/129888
554+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
555+
method: test {p0=search.vectors/40_knn_search/Dimensions are dynamically set}
556+
issue: https://github.com/elastic/elasticsearch/issues/130626
554557

555558
# Examples:
556559
#

rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_component_template.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
"description":"Whether the index template should only be added if new or can also replace an existing one",
3434
"default":false
3535
},
36-
"timeout":{
37-
"type":"time",
38-
"description":"Explicit operation timeout"
36+
"cause": {
37+
"type": "string",
38+
"description": "User defined reason for create the component template",
39+
"default": "api"
3940
},
4041
"master_timeout":{
4142
"type":"time",

0 commit comments

Comments
 (0)