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](backport #42177) [go.mod] update elastic-agent-system-metrics #42354

Open
wants to merge 1 commit into
base: 8.17
Choose a base branch
from
Open

[8.17](backport #42177) [go.mod] update elastic-agent-system-metrics #42354

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 20, 2025

Closes #41407

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

@VihasMakwana @mergify
[go.mod] update elastic-agent-system-metrics (#42177)
c01ed1a 
* go.mod

* changelog

* notice

(cherry picked from commit 111a480)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 20, 2025
@mergify mergify bot requested a review from a team as a code owner January 20, 2025 16:56
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jan 20, 2025

Cherry-pick of 111a480 has failed:

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

You are currently cherry-picking commit 111a480d4.
  (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:   NOTICE.txt

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

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 Jan 20, 2025
@botelastic
Copy link

botelastic bot commented Jan 20, 2025

This pull request doesn't have a Team:<team> label.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@VihasMakwana VihasMakwana

Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@VihasMakwana