Skip to content

Commit

Permalink
[9.0](backport #43029) [main](backport #42980) docs: Prepare Changelo…
Browse files Browse the repository at this point in the history
…g 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 <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
(cherry picked from commit 1896cda)

Co-authored-by: elastic-vault-github-plugin-prod[bot] <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com>
(cherry picked from commit ef6b4a6)

# 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 <pierre.hilbert@elastic.co>
(cherry picked from commit 61a93f0)

# Conflicts:
#	libbeat/docs/release.asciidoc
  • Loading branch information
mergify[bot] committed Mar 5, 2025
1 parent 0536310 commit c08770b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions libbeat/docs/release.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ This section summarizes the changes in each release. Also read
<<breaking-changes>> for more detail about changes that affect
upgrade.

<<<<<<< HEAD
=======
* <<release-notes-9.0.0-beta1>>
>>>>>>> 61a93f045 ([9.0](backport #43029) [main](backport #42980) docs: Prepare Changelog for 8.17.3 (#43041))
* <<release-notes-8.17.3>>
* <<release-notes-8.17.2>>
* <<release-notes-8.17.1>>
Expand Down

0 comments on commit c08770b

Please sign in to comment.