From c08770bbc30b0ad41034daf4990fd337e79cb842 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:09:50 +0000 Subject: [PATCH] [9.0](backport #43029) [main](backport #42980) docs: Prepare Changelog for 8.17.3 (#43041) * docs: Prepare Changelog for 8.17.3 (#42980) (#43029) * docs: Close changelog for 8.17.3 * Remove empty sections and update changelog entries --------- Co-authored-by: elasticmachine Co-authored-by: Pierre HILBERT (cherry picked from commit 1896cdac8925179b8c823c3cbdab145c1a5ee8f1) Co-authored-by: elastic-vault-github-plugin-prod[bot] <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com> (cherry picked from commit ef6b4a6c463b8f9bfa23802bc0e4fb742c9534e5) # Conflicts: # CHANGELOG.asciidoc # libbeat/docs/release.asciidoc * Resolve merge conflict in CHANGELOG.asciidoc * Resolve merge conflict in release notes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Pierre HILBERT (cherry picked from commit 61a93f0458232f21cf70dea43f30969efc54132c) # Conflicts: # libbeat/docs/release.asciidoc --- libbeat/docs/release.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc index f37aa317b67..d35e3978696 100644 --- a/libbeat/docs/release.asciidoc +++ b/libbeat/docs/release.asciidoc @@ -8,6 +8,10 @@ This section summarizes the changes in each release. Also read <> for more detail about changes that affect upgrade. +<<<<<<< HEAD +======= +* <> +>>>>>>> 61a93f045 ([9.0](backport #43029) [main](backport #42980) docs: Prepare Changelog for 8.17.3 (#43041)) * <> * <> * <>