[backport] build(deps): Bump golang.org/x/net from 0.47.0 to 0.48.0 (#1234)#1236
Open
mergify[bot] wants to merge 2 commits intorelease/v1.6from
Open
[backport] build(deps): Bump golang.org/x/net from 0.47.0 to 0.48.0 (#1234)#1236mergify[bot] wants to merge 2 commits intorelease/v1.6from
mergify[bot] wants to merge 2 commits intorelease/v1.6from
Conversation
Contributor
Author
|
Cherry-pick of 474d4af has failed: 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 |
Contributor
Author
|
❗❗❗ git rebase HEAD~1 --signoff
git push --force-with-lease origin mergify/bp/release/v1.6/pr-1234 |
Contributor
Author
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 Enforce verified commitsWonderful, this rule succeeded.Make sure that we have verified commits
🟢 Enforce linear historyWonderful, this rule succeeded.Make sure that we have a linear history, no merge commits are allowed
|
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.47.0 to 0.48.0. - [Commits](golang/net@v0.47.0...v0.48.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.48.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 474d4af) # Conflicts: # go.mod # go.sum Signed-off-by: Lin Yang <reaver@flomesh.io>
3fa56b8 to
bc22497
Compare
Signed-off-by: Lin Yang <reaver@flomesh.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps golang.org/x/net from 0.47.0 to 0.48.0.
Commits
35e1306go.mod: update golang.org/x dependencies7c36036http2, webdav, websocket: fix %q verb uses with wrong typeec11ecctrace: fix data race in RenderEventsbff14c5http2: don't PING a responsive server when resetting a stream88a6421dns/dnsmessage: avoid use of "strings" and "math" in dns/dnsmessage123d099http2: support net/http.Transport.NewClientConn346cc61webdav: relax test to check for any redirect status, not just 301Dependabot 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 rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)This is an automatic backport of pull request #1234 done by [Mergify](https://mergify.com).