From e598f149de9dcfa2cc4ad101681b3909a8f890ad Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 15 Apr 2024 18:27:22 +0200 Subject: [PATCH 1/2] docs: remove false deprecation note for standalone apm-server (#3752) (cherry picked from commit 38f04c90afb0f794a0b3a54b54b6a3b33e0642ff) # Conflicts: # docs/en/apm-server/upgrading-to-8.x.asciidoc --- docs/en/apm-server/upgrading-to-8.x.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/apm-server/upgrading-to-8.x.asciidoc b/docs/en/apm-server/upgrading-to-8.x.asciidoc index 12fb1560ba..8af523123f 100644 --- a/docs/en/apm-server/upgrading-to-8.x.asciidoc +++ b/docs/en/apm-server/upgrading-to-8.x.asciidoc @@ -29,8 +29,12 @@ See the APM <>, <> f Starting in version 7.14, there are two ways to run Elastic APM. Determine which method you're using, then use the links below to find the correct upgrading guide. +<<<<<<< HEAD:docs/en/apm-server/upgrading-to-8.x.asciidoc * **Standalone (legacy)**: Users in this mode run and configure the APM Server binary. This mode has been deprecated and will be removed in a future release. +======= +* **Standalone**: Users in this mode run and configure the APM Server binary. +>>>>>>> 38f04c90 (docs: remove false deprecation note for standalone apm-server (#3752)):docs/en/observability/apm/upgrading-to-8.x.asciidoc * **{fleet} and the APM integration**: Users in this mode run and configure {fleet} and the Elastic APM integration. **Self-installation (non-{ecloud} users) upgrade guides** From a8e547a863161c8478e78bd52935242ad03ca46c Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 15 Apr 2024 09:57:31 -0700 Subject: [PATCH 2/2] Update docs/en/apm-server/upgrading-to-8.x.asciidoc --- docs/en/apm-server/upgrading-to-8.x.asciidoc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/en/apm-server/upgrading-to-8.x.asciidoc b/docs/en/apm-server/upgrading-to-8.x.asciidoc index 8af523123f..57a63b7adc 100644 --- a/docs/en/apm-server/upgrading-to-8.x.asciidoc +++ b/docs/en/apm-server/upgrading-to-8.x.asciidoc @@ -29,12 +29,7 @@ See the APM <>, <> f Starting in version 7.14, there are two ways to run Elastic APM. Determine which method you're using, then use the links below to find the correct upgrading guide. -<<<<<<< HEAD:docs/en/apm-server/upgrading-to-8.x.asciidoc -* **Standalone (legacy)**: Users in this mode run and configure the APM Server binary. -This mode has been deprecated and will be removed in a future release. -======= * **Standalone**: Users in this mode run and configure the APM Server binary. ->>>>>>> 38f04c90 (docs: remove false deprecation note for standalone apm-server (#3752)):docs/en/observability/apm/upgrading-to-8.x.asciidoc * **{fleet} and the APM integration**: Users in this mode run and configure {fleet} and the Elastic APM integration. **Self-installation (non-{ecloud} users) upgrade guides**