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.18](backport #42667) [main](backport #42653) docs: Prepare Changelog for 8.16.4 #42670

Merged
merged 3 commits into from
Feb 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 11, 2025

Prepare Changelog for 8.16.4.

Merge once the BC that will be published is decided.


This is an automatic backport of pull request #42653 done by Mergify.
This is an automatic backport of pull request #42667 done by Mergify.

* docs: Prepare Changelog for 8.16.4 (#42653)

* docs: Close changelog for 8.16.4

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

---------

Co-authored-by: elasticmachine <[email protected]>
Co-authored-by: Pierre HILBERT <[email protected]>
(cherry picked from commit 632fdf9)

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

* Update CHANGELOG.asciidoc

* Update release.asciidoc

---------

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 <[email protected]>
(cherry picked from commit 6d60672)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot requested a review from a team as a code owner February 11, 2025 13:30
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 11, 2025
@mergify mergify bot requested review from khushijain21 and VihasMakwana and removed request for a team February 11, 2025 13:30
Copy link
Contributor Author

mergify bot commented Feb 11, 2025

Cherry-pick of 6d60672 has failed:

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

You are currently cherry-picking commit 6d6067288.
  (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 Feb 11, 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 Feb 11, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 11, 2025
@pierrehilbert pierrehilbert merged commit e9ff7fe into 8.18 Feb 12, 2025
142 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/8.18/pr-42667 branch February 12, 2025 06:27
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