Skip to content

Commit

Permalink
Merge pull request #105 from derekhiggins/OCPBUGS-21549
Browse files Browse the repository at this point in the history
OCPBUGS-21549: Uplift x/net to v0.17.0
  • Loading branch information
openshift-ci[bot] committed Oct 20, 2023
2 parents 0f4119d + c3cd46b commit 4831855
Show file tree
Hide file tree
Showing 207 changed files with 21,404 additions and 4,821 deletions.
13 changes: 7 additions & 6 deletions go.mod
Expand Up @@ -206,15 +206,15 @@ require (
go.uber.org/zap v1.24.0 // indirect
golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a // indirect
golang.org/x/exp/typeparams v0.0.0-20230108222341-4b8118a2686a // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.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-20220609170525-579cf78fd858 // indirect
golang.org/x/tools v0.5.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.1 // indirect
Expand All @@ -241,4 +241,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
)
89 changes: 13 additions & 76 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.

6 changes: 1 addition & 5 deletions vendor/golang.org/x/net/http2/pipe.go

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

102 changes: 80 additions & 22 deletions vendor/golang.org/x/net/http2/server.go

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

0 comments on commit 4831855

Please sign in to comment.