Skip to content
Permalink
Browse files

Merge pull request #81522 from cblecker/1.15-x/net

Update golang/x/net dependency on release-1.15
  • Loading branch information...
k8s-ci-robot committed Aug 16, 2019
2 parents 7812423 + 842ee1f commit 2d3c76f9091b6bec110a5e63777c332469e0cba2
Showing with 99 additions and 63 deletions.
  1. +2 −2 go.mod
  2. +2 −2 go.sum
  3. +2 −2 staging/src/k8s.io/api/go.sum
  4. +2 −2 staging/src/k8s.io/apiextensions-apiserver/go.sum
  5. +1 −1 staging/src/k8s.io/apimachinery/go.mod
  6. +2 −2 staging/src/k8s.io/apimachinery/go.sum
  7. +1 −1 staging/src/k8s.io/apiserver/go.mod
  8. +2 −2 staging/src/k8s.io/apiserver/go.sum
  9. +2 −2 staging/src/k8s.io/cli-runtime/go.sum
  10. +1 −1 staging/src/k8s.io/client-go/go.mod
  11. +2 −2 staging/src/k8s.io/client-go/go.sum
  12. +2 −2 staging/src/k8s.io/cloud-provider/go.sum
  13. +2 −2 staging/src/k8s.io/cluster-bootstrap/go.sum
  14. +2 −2 staging/src/k8s.io/component-base/go.sum
  15. +1 −1 staging/src/k8s.io/cri-api/go.mod
  16. +2 −2 staging/src/k8s.io/cri-api/go.sum
  17. +2 −2 staging/src/k8s.io/csi-translation-lib/go.sum
  18. +1 −1 staging/src/k8s.io/kube-aggregator/go.mod
  19. +2 −2 staging/src/k8s.io/kube-aggregator/go.sum
  20. +2 −2 staging/src/k8s.io/kube-controller-manager/go.sum
  21. +2 −2 staging/src/k8s.io/kube-proxy/go.sum
  22. +2 −2 staging/src/k8s.io/kube-scheduler/go.sum
  23. +2 −2 staging/src/k8s.io/kubelet/go.sum
  24. +2 −2 staging/src/k8s.io/legacy-cloud-providers/go.sum
  25. +2 −2 staging/src/k8s.io/metrics/go.sum
  26. +2 −2 staging/src/k8s.io/node-api/go.sum
  27. +2 −2 staging/src/k8s.io/sample-apiserver/go.sum
  28. +2 −2 staging/src/k8s.io/sample-cli-plugin/go.sum
  29. +2 −2 staging/src/k8s.io/sample-controller/go.sum
  30. +38 −8 vendor/golang.org/x/net/http2/server.go
  31. +7 −1 vendor/golang.org/x/net/http2/writesched.go
  32. +1 −1 vendor/modules.txt
4 go.mod
@@ -153,7 +153,7 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
golang.org/x/sys v0.0.0-20190312061237-fead79001313
golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
@@ -404,7 +404,7 @@ replace (
golang.org/x/image => golang.org/x/image v0.0.0-20190227222117-0694c2d4d067
golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1
golang.org/x/mobile => golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6
golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
4 go.sum
@@ -410,8 +410,8 @@ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMx
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 h1:rJm0LuqUjoDhSk2zO9ISMSToQxGz7Os2jRiOL8AWu4c=
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80=
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -25,7 +25,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.1
github.com/stretchr/testify v1.2.2
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect

Some generated files are not rendered by default. Learn more.

@@ -49,7 +49,7 @@ require (
go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df // indirect
go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 // indirect
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 // indirect
google.golang.org/grpc v1.13.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -22,7 +22,7 @@ require (
github.com/spf13/pflag v1.0.1
github.com/stretchr/testify v1.2.2
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
google.golang.org/appengine v1.5.0 // indirect

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -11,7 +11,7 @@ require (
github.com/golang/protobuf v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.2
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 // indirect

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -14,7 +14,7 @@ require (
github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937
github.com/spf13/pflag v1.0.1
github.com/stretchr/testify v1.2.2
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/apiserver v0.0.0

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

0 comments on commit 2d3c76f

Please sign in to comment.
You can’t perform that action at this time.