Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main](backport #43041) [9.0](backport #43029) [main](backport #42980) docs: Prepare Changelog for 8.17.3 #43046

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2025

Prepare Changelog for 8.17.3.

Merge once the BC that will be published is decided.


This is an automatic backport of pull request #42980 done by Mergify.
This is an automatic backport of pull request #43029 done by Mergify.
This is an automatic backport of pull request #43041 done by Mergify.

…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
@mergify mergify bot requested a review from a team as a code owner March 5, 2025 14:10
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 5, 2025
@mergify mergify bot requested review from AndersonQ and mauri870 March 5, 2025 14:10
Copy link
Contributor Author

mergify bot commented Mar 5, 2025

Cherry-pick of 61a93f0 has failed:

On branch mergify/bp/main/pr-43041
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 61a93f045.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/docs/release.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 5, 2025
@github-actions github-actions bot added docs in progress Pull request is currently in progress. release automation Team:Automation Label for the Observability productivity team forwardport-main Automated forwardport with mergify labels Mar 5, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport conflicts There is a conflict in the backported pull request docs forwardport-main Automated forwardport with mergify in progress Pull request is currently in progress. release Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant