Skip to content

Commit

Permalink
Merge pull request #106 from derekhiggins/OCPBUGS-21543
Browse files Browse the repository at this point in the history
OCPBUGS-21543: Uplift x/net to v0.17.0
  • Loading branch information
openshift-ci[bot] committed Oct 20, 2023
2 parents 30adb68 + c14df18 commit c3f7820
Show file tree
Hide file tree
Showing 290 changed files with 27,397 additions and 7,889 deletions.
15 changes: 8 additions & 7 deletions go.mod
Expand Up @@ -195,15 +195,15 @@ require (
go.uber.org/zap v1.19.1 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.2.0 // indirect
golang.org/x/tools v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
Expand All @@ -230,4 +230,5 @@ replace (
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20230824090041-d75786e0f23c
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20230824090041-d75786e0f23c
github.com/metal3-io/baremetal-operator/pkg/hardwareutils => github.com/openshift/baremetal-operator/pkg/hardwareutils v0.0.0-20230824090041-d75786e0f23c
golang.org/x/net => golang.org/x/net v0.17.0
)
95 changes: 16 additions & 79 deletions go.sum

Large diffs are not rendered by default.

51 changes: 0 additions & 51 deletions vendor/golang.org/x/net/http2/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/golang.org/x/net/http2/Makefile

This file was deleted.

88 changes: 78 additions & 10 deletions vendor/golang.org/x/net/http2/flow.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion vendor/golang.org/x/net/http2/frame.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/golang.org/x/net/http2/headermap.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/golang.org/x/net/http2/hpack/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c3f7820

Please sign in to comment.