Merge branch '7.x' into backport/7.x/pr-56772

elastic · Feb 4, 2020 · 5a17b6e · 5a17b6e
2 parents e59e772 + 33f937e
commit 5a17b6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
@@ -51,7 +51,7 @@ instructions.
 [[upgrade-6x]]
 === Upgrading from 6.x
 
-The recommended path is to upgrade to 6.7 before upgrading to 7.0. This makes it 
+The recommended path is to upgrade to 6.8 before upgrading to 7.0. This makes it 
 easier to identify the required changes, and enables you to use the Upgrade 
 Assistant to prepare for your upgrade to 7.0.
 
@@ -60,11 +60,11 @@ dashboards is supported.
 
 [float]
 [[upgrade-67]]
-=== Upgrading from 6.7
-To help you prepare for your upgrade to 7.0, 6.7 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[Upgrade Assistant] 
-To access the assistant, go to *Management > 7.0 Upgrade Assistant*. 
+=== Upgrading from 6.8
+To help you prepare for your upgrade to 7.0, 6.8 includes an https://www.elastic.co/guide/en/kibana/6.8/upgrade-assistant.html[Upgrade Assistant] 
+To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
 
-After you have addressed any issues that were identified by the Upgrade 
+After you have addressed any issues that were identified by the Upgrade
 Assistant, <<upgrade-standard,upgrade to 7.0>>.
 
 [float]

diff --git a/...nitoring/public/components/alerts/configuration/__snapshots__/configuration.test.tsx.snap b/...nitoring/public/components/alerts/configuration/__snapshots__/configuration.test.tsx.snap
diff --git a/...ugins/monitoring/public/components/alerts/configuration/__snapshots__/step1.test.tsx.snap b/...ugins/monitoring/public/components/alerts/configuration/__snapshots__/step1.test.tsx.snap