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 #43432) docs: Prepare Changelog for 8.17.4 #43483

Merged
merged 3 commits into from
Mar 26, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2025

Prepare Changelog for 8.17.4.

Merge once the BC that will be published is decided.


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

* docs: Close changelog for 8.17.4

* Remove empty sections from CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

Co-authored-by: David Kilfoyle <[email protected]>

* Update CHANGELOG.asciidoc

Co-authored-by: David Kilfoyle <[email protected]>

* Update CHANGELOG.asciidoc

Co-authored-by: David Kilfoyle <[email protected]>

* Update CHANGELOG.asciidoc

Co-authored-by: Craig MacKenzie <[email protected]>

* Move Filebeat bugfix to correct section

---------

Co-authored-by: elasticmachine <[email protected]>
Co-authored-by: Pierre HILBERT <[email protected]>
Co-authored-by: David Kilfoyle <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit d6cb6e4)

# Conflicts:
#	CHANGELOG.asciidoc
@mergify mergify bot requested a review from a team as a code owner March 25, 2025 15:28
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 25, 2025
@mergify mergify bot requested a review from leehinman March 25, 2025 15:28
Copy link
Contributor Author

mergify bot commented Mar 25, 2025

Cherry-pick of d6cb6e4 has failed:

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

You are currently cherry-picking commit d6cb6e488.
  (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
	modified:   libbeat/docs/release.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.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

@mergify mergify bot requested a review from khushijain21 March 25, 2025 15:28
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 25, 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 25, 2025
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 25, 2025
@pierrehilbert pierrehilbert merged commit 2f33134 into main Mar 26, 2025
152 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/main/pr-43432 branch March 26, 2025 11:14
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