Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2025

Proposed commit message

See title

Checklist

  • [ ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

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

(cherry picked from commit 65a4545)

# Conflicts:
#	go.mod
@mergify mergify bot requested a review from a team as a code owner June 17, 2025 13:53
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 17, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 17, 2025

Cherry-pick of 65a4545 has failed:

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

You are currently cherry-picking commit 65a45456c.
  (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:   NOTICE.txt
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

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 Jun 17, 2025
@github-actions github-actions bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team dependencies Pull requests that update a dependency file labels Jun 17, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 17, 2025
@khushijain21 khushijain21 merged commit d84e813 into 8.19 Jun 18, 2025
197 of 200 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.19/pr-44862 branch June 18, 2025 05:43
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 dependencies Pull requests that update a dependency file Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants