Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2025

Bumps the golang-org-x group with 1 update: golang.org/x/net.

Updates golang.org/x/net from 0.45.0 to 0.46.0

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

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

…g-org-x group (#19046)

* build(deps): bump golang.org/x/net in the golang-org-x group

Bumps the golang-org-x group with 1 update: [golang.org/x/net](https://github.com/golang/net).

Updates `golang.org/x/net` from 0.45.0 to 0.46.0
- [Commits](golang/net@v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.46.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-org-x
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update NOTICE.txt

* Update NOTICE-fips.txt

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit 2abdae3)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner October 10, 2025 11:24
Copy link
Contributor Author

mergify bot commented Oct 10, 2025

Cherry-pick of 2abdae3 has failed:

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

You are currently cherry-picking commit 2abdae32.
  (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-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2025
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@kruskall kruskall enabled auto-merge (squash) October 10, 2025 12:28
@mergify mergify bot added the queued label Oct 10, 2025
mergify bot added a commit that referenced this pull request Oct 10, 2025
@mergify mergify bot merged commit ee4234f into 9.0 Oct 10, 2025
15 checks passed
@mergify mergify bot deleted the mergify/bp/9.0/pr-19046 branch October 10, 2025 12:46
@mergify mergify bot removed the queued label Oct 10, 2025
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant