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

[8.17](backport #4625) chore(deps): update golang.org/x/net v0.37.0 #4628

Merged
merged 5 commits into from
Mar 25, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2025


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

* go get golang.org/x/net

* go mod tidy

* make notice

* cd testing && go get golang.org/x/net && go mod tidy

(cherry picked from commit 8c94260)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	testing/go.mod
#	testing/go.sum
@mergify mergify bot requested a review from a team as a code owner March 25, 2025 09:29
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 25, 2025
@mergify mergify bot requested review from kaanyalti and andrzej-stencel March 25, 2025 09:29
Copy link
Contributor Author

mergify bot commented Mar 25, 2025

Cherry-pick of 8c94260 has failed:

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

You are currently cherry-picking commit 8c94260.
  (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:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   testing/go.mod
	both modified:   testing/go.sum

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Mar 25, 2025
@andrzej-stencel andrzej-stencel enabled auto-merge (squash) March 25, 2025 14:14
Copy link
Contributor Author

mergify bot commented Mar 25, 2025

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.17/pr-4625 upstream/mergify/bp/8.17/pr-4625
git merge upstream/8.17
git push upstream mergify/bp/8.17/pr-4625

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@andrzej-stencel andrzej-stencel merged commit 85be38a into 8.17 Mar 25, 2025
9 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/8.17/pr-4625 branch March 25, 2025 16:23
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 Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants