From 8f53826cae796e13c3fedb2ec678a37281a47b7d Mon Sep 17 00:00:00 2001 From: Alison Goryachev Date: Thu, 25 Feb 2021 13:42:01 -0500 Subject: [PATCH] update backport --- .../generated/cluster.get_component_template.json | 3 ++- .../overrides/cluster.put_component_template.json | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json index 784053d69ad5a..cbfed6741f8a4 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json @@ -12,5 +12,6 @@ "_component_template", "_component_template/{name}" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html" } + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html" + } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json index e1cb32c39daad..e305137a221ac 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "cluster.put_component_template": { "data_autocomplete_rules": { "settings": { @@ -15,17 +14,6 @@ "mappings": { "__scope_link": "put_mapping" } -======= - "indices.put_template": { - "data_autocomplete_rules": { - "template": {}, - "aliases": {}, - "settings": {}, - "mappings": {}, - "version": 0, - "_meta": {}, - "allow_auto_create": false ->>>>>>> 06d966eca57... [Console] Autocompletion of component_templates (#91180) } } }