Skip to content

Commit

Permalink
Merge pull request #370 from elfosardo/ocpbugs20867
Browse files Browse the repository at this point in the history
OCPBUGS-20867: Uplift x/net to v0.17.0
  • Loading branch information
openshift-ci[bot] committed Oct 20, 2023
2 parents 3d1da56 + a9cc1e4 commit 7fdf58c
Show file tree
Hide file tree
Showing 274 changed files with 24,132 additions and 6,638 deletions.
18 changes: 10 additions & 8 deletions go.mod
Expand Up @@ -14,7 +14,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/stretchr/stew v0.0.0-20130812190256-80ef0842b48b
github.com/stretchr/testify v1.8.0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/crypto v0.14.0
k8s.io/api v0.24.9
k8s.io/apimachinery v0.24.9
k8s.io/client-go v0.24.9
Expand Down Expand Up @@ -209,15 +209,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-dev.0.20220419223038-86c51ed26bb4 // 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.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // 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/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-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.1.12 // 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 Down Expand Up @@ -248,3 +248,5 @@ replace github.com/metal3-io/baremetal-operator => github.com/openshift/baremeta
replace github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20221021112927-c457e46aec1e

replace github.com/metal3-io/baremetal-operator/pkg/hardwareutils => github.com/openshift/baremetal-operator/pkg/hardwareutils v0.0.0-20221021112927-c457e46aec1e

replace 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.

11 changes: 10 additions & 1 deletion vendor/golang.org/x/crypto/bcrypt/bcrypt.go

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

2 changes: 1 addition & 1 deletion vendor/golang.org/x/mod/modfile/read.go

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

3 changes: 3 additions & 0 deletions vendor/golang.org/x/mod/modfile/rule.go

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

4 changes: 2 additions & 2 deletions vendor/golang.org/x/mod/module/module.go

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

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 7fdf58c

Please sign in to comment.