From 3f0ab73c8efc8779380ee3f294c94ce4d9fde468 Mon Sep 17 00:00:00 2001 From: lcawl Date: Tue, 19 Feb 2019 11:43:41 -0800 Subject: [PATCH 1/2] [DOCS] Update version detail in upgrade instructions --- docs/en/install-upgrade/upgrading-stack.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/install-upgrade/upgrading-stack.asciidoc b/docs/en/install-upgrade/upgrading-stack.asciidoc index a3db092ed..0d60e45b9 100644 --- a/docs/en/install-upgrade/upgrading-stack.asciidoc +++ b/docs/en/install-upgrade/upgrading-stack.asciidoc @@ -23,8 +23,8 @@ Rolling upgrades are supported when upgrading from Elasticsearch 5.6 and Elasticsearch 6.0-6.2 to {version}. Upgrading from any version prior to 5.6 requires a full cluster restart. -IMPORTANT: 2.x indices are not compatible with {version}. You must -remove or reindex them on your 5.n cluster before upgrading to {version}. The internal +IMPORTANT: 5.x indices are not compatible with {version}. You must +remove or reindex them on your 6.x cluster before upgrading to {version}. The internal Kibana and {xpack} indices and the default Beats and Logstash mapping templates also need to be updated to work with {version}. From a5ed0dc76e36323935d68b9af55e43e3fd5c479f Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 25 Feb 2019 13:50:44 -0800 Subject: [PATCH 2/2] [DOCS] Addresses feedback --- docs/en/install-upgrade/upgrading-stack.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/install-upgrade/upgrading-stack.asciidoc b/docs/en/install-upgrade/upgrading-stack.asciidoc index 0d60e45b9..37cd3a17f 100644 --- a/docs/en/install-upgrade/upgrading-stack.asciidoc +++ b/docs/en/install-upgrade/upgrading-stack.asciidoc @@ -23,7 +23,7 @@ Rolling upgrades are supported when upgrading from Elasticsearch 5.6 and Elasticsearch 6.0-6.2 to {version}. Upgrading from any version prior to 5.6 requires a full cluster restart. -IMPORTANT: 5.x indices are not compatible with {version}. You must +IMPORTANT: 5.x and older indices are not compatible with {version}. You must remove or reindex them on your 6.x cluster before upgrading to {version}. The internal Kibana and {xpack} indices and the default Beats and Logstash mapping templates also need to be updated to work with {version}.