Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2025


This is an automatic backport of pull request #17550 done by [Mergify](https://mergify.com).

* Update release notes for 8.17.5

* Filter out non-user facing commits/changes from release notes

* Update based on PR review

Co-authored-by: Karen Metts <[email protected]>

---------

Co-authored-by: logstashmachine <[email protected]>
Co-authored-by: donoghuc <[email protected]>
Co-authored-by: Karen Metts <[email protected]>
(cherry picked from commit 16ee40c)

# Conflicts:
#	docs/static/releasenotes.asciidoc
@mergify mergify bot added backport conflicts Detected git conflicts labels Apr 15, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 15, 2025

Cherry-pick of 16ee40c has failed:

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

You are currently cherry-picking commit 16ee40ca.
  (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:   docs/static/releasenotes.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

@mergify mergify bot mentioned this pull request Apr 15, 2025
Copy link
Contributor

@mashhurs mashhurs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@donoghuc donoghuc merged commit b89861a into 8.18 Apr 15, 2025
6 checks passed
@donoghuc donoghuc deleted the mergify/bp/8.18/pr-17550 branch April 15, 2025 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts Detected git conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants