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

[8.17](backport #43005) [main](backport #42976) docs: Prepare Changelog for 8.16.5 #43023

Merged
merged 3 commits into from
Mar 5, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 4, 2025

Prepare Changelog for 8.16.5.

Merge once the BC that will be published is decided.


This is an automatic backport of pull request #42976 done by Mergify.
This is an automatic backport of pull request #43005 done by Mergify.

* docs: Prepare Changelog for 8.16.5 (#42976)

* docs: Close changelog for 8.16.5

* Remove empty sections from CHANGELOG.asciidoc

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
(cherry picked from commit a2167aa)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc

* Fixing conflict

* Resolve merge conflict in release notes.

---------

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

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot requested a review from a team as a code owner March 4, 2025 22:03
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 4, 2025
@mergify mergify bot requested review from AndersonQ and VihasMakwana and removed request for a team March 4, 2025 22:03
Copy link
Contributor Author

mergify bot commented Mar 4, 2025

Cherry-pick of 2050421 has failed:

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

You are currently cherry-picking commit 2050421ad.
  (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)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc

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

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 4, 2025
@botelastic
Copy link

botelastic bot commented Mar 4, 2025

This pull request doesn't have a Team:<team> label.

@pierrehilbert pierrehilbert enabled auto-merge (squash) March 4, 2025 22:09
@pierrehilbert
Copy link
Collaborator

Unrelated failure, force merging this changelog PR.

@pierrehilbert pierrehilbert disabled auto-merge March 5, 2025 07:12
@pierrehilbert pierrehilbert merged commit 37c6005 into 8.17 Mar 5, 2025
140 of 144 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/8.17/pr-43005 branch March 5, 2025 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant