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.

Sign up for GitHub

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

Jump to bottom

[8.17] changelog for APM Server monitoring fixes (backport #15561) #15651

Merged
merged 2 commits into from
Feb 10, 2025
Merged

[8.17] changelog for APM Server monitoring fixes (backport #15561) #15651

merged 2 commits into from
Feb 10, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 10, 2025

Motivation/summary

Changes have been backported to 8.16.4 and 8.17.2 that require a changelog entry.

See #14247 (comment).

Checklist

How to test these changes

Related issues

#14247

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

@endorama @mergify
changelog for APM Server monitoring fixes (#15561)
ca81d0a 
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

# Conflicts:
#	changelogs/8.16.asciidoc
@mergify mergify bot requested a review from a team as a code owner February 10, 2025 18:59
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 10, 2025
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Feb 10, 2025

Cherry-pick of 6c9108b has failed:

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

You are currently cherry-picking commit 6c9108be.
  (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:   changelogs/8.17.asciidoc

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

@1pkg 1pkg enabled auto-merge (squash) February 10, 2025 19:09
@mergify mergify bot merged commit 639e0ad into 8.17 Feb 10, 2025
10 checks passed
@mergify mergify bot deleted the mergify/bp/8.17/pr-15561 branch February 10, 2025 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1pkg 1pkg 1pkg approved these changes

Assignees

@endorama endorama

Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@1pkg @endorama