From 8fd1e29787607881afcbf9ab040b5a7322001a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Thu, 15 Oct 2020 20:21:47 +0200 Subject: [PATCH 1/4] Update elasticsearch.md Clarified Elasticsearch documentation --- src/guides/v2.4/install-gde/prereq/elasticsearch.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/guides/v2.4/install-gde/prereq/elasticsearch.md b/src/guides/v2.4/install-gde/prereq/elasticsearch.md index 055cac3cacd..ebba025aea8 100644 --- a/src/guides/v2.4/install-gde/prereq/elasticsearch.md +++ b/src/guides/v2.4/install-gde/prereq/elasticsearch.md @@ -23,7 +23,7 @@ As of Magento 2.4, all installations must be configured to use [Elasticsearch][] ## Supported versions {#es-spt-versions} -You must install and configure Elasticsearch 7.6.x before upgrading to Magento 2.4.0. +You must install and configure Elasticsearch 7.x before upgrading to Magento 2.4.x. {:.bs-callout-info} Magento does not support Elasticsearch 2.x, 5.x, and 6.x. @@ -75,14 +75,14 @@ The tasks discussed in this section require the following: * [Firewall and SELinux](#firewall-selinux) * [Install the Java Software Development Kit (JDK)](#prereq-java) -* [Install Elasticsearch](#es-install-es6) +* [Install Elasticsearch](#es-install-es7) * [Upgrading Elasticsearch](#es-upgrade6) {% include config/solr-elastic-selinux.md %} {% include config/install-java8.md %} -### Install Elasticsearch {#es-install-es6} +### Install Elasticsearch {#es-install-es7} Follow [Installing Elasticsearch][] for your platform-specific steps. From 8da42ee6fb5d4b36c08da1c581636b0094026e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Thu, 15 Oct 2020 20:33:50 +0200 Subject: [PATCH 2/4] Update elasticsearch.md removed "support for Elasticsearch 7.x" in documentation again. --- src/guides/v2.4/install-gde/prereq/elasticsearch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.4/install-gde/prereq/elasticsearch.md b/src/guides/v2.4/install-gde/prereq/elasticsearch.md index ebba025aea8..58604b0a288 100644 --- a/src/guides/v2.4/install-gde/prereq/elasticsearch.md +++ b/src/guides/v2.4/install-gde/prereq/elasticsearch.md @@ -23,7 +23,7 @@ As of Magento 2.4, all installations must be configured to use [Elasticsearch][] ## Supported versions {#es-spt-versions} -You must install and configure Elasticsearch 7.x before upgrading to Magento 2.4.x. +You must install and configure Elasticsearch 7.6.x before upgrading to Magento 2.4.x. {:.bs-callout-info} Magento does not support Elasticsearch 2.x, 5.x, and 6.x. From fe69f27ffc8ad601a21269643dad2c5f03ad3aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Thu, 15 Oct 2020 20:48:10 +0200 Subject: [PATCH 3/4] Update elasticsearch.md added extended explanation regarding compatibility other ES 7.x versions --- src/guides/v2.4/install-gde/prereq/elasticsearch.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/guides/v2.4/install-gde/prereq/elasticsearch.md b/src/guides/v2.4/install-gde/prereq/elasticsearch.md index 58604b0a288..82ebdcc50a0 100644 --- a/src/guides/v2.4/install-gde/prereq/elasticsearch.md +++ b/src/guides/v2.4/install-gde/prereq/elasticsearch.md @@ -25,6 +25,8 @@ As of Magento 2.4, all installations must be configured to use [Elasticsearch][] You must install and configure Elasticsearch 7.6.x before upgrading to Magento 2.4.x. +Be aware, that Magento 2.4.x is only tested with Elasticsearch 7.6.x at the moment. You can use other (7.x) versions at your discretion, but we recommend using the tested version of Elasticsearch. + {:.bs-callout-info} Magento does not support Elasticsearch 2.x, 5.x, and 6.x. From 1e9cf3f4e19f58cd08d3dd6776aec7845e59ae59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Thu, 15 Oct 2020 20:53:40 +0200 Subject: [PATCH 4/4] Update src/guides/v2.4/install-gde/prereq/elasticsearch.md Co-authored-by: Jeff Matthews --- src/guides/v2.4/install-gde/prereq/elasticsearch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.4/install-gde/prereq/elasticsearch.md b/src/guides/v2.4/install-gde/prereq/elasticsearch.md index 82ebdcc50a0..26cfbd9b3ef 100644 --- a/src/guides/v2.4/install-gde/prereq/elasticsearch.md +++ b/src/guides/v2.4/install-gde/prereq/elasticsearch.md @@ -25,7 +25,7 @@ As of Magento 2.4, all installations must be configured to use [Elasticsearch][] You must install and configure Elasticsearch 7.6.x before upgrading to Magento 2.4.x. -Be aware, that Magento 2.4.x is only tested with Elasticsearch 7.6.x at the moment. You can use other (7.x) versions at your discretion, but we recommend using the tested version of Elasticsearch. +Magento 2.4.x is tested with Elasticsearch 7.6.x only. You can use other 7.x versions at your discretion, but we recommend using the tested version of Elasticsearch. {:.bs-callout-info} Magento does not support Elasticsearch 2.x, 5.x, and 6.x.