Skip to content

Commit 2d3c76f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#81522 from cblecker/1.15-x/net
Update golang/x/net dependency on release-1.15
2 parents 7812423 + 842ee1f commit 2d3c76f

File tree

32 files changed

+99
-63
lines changed

32 files changed

+99
-63
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ require (
153153
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
154154
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
155155
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1
156-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
156+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
157157
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
158158
golang.org/x/sys v0.0.0-20190312061237-fead79001313
159159
golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
@@ -404,7 +404,7 @@ replace (
404404
golang.org/x/image => golang.org/x/image v0.0.0-20190227222117-0694c2d4d067
405405
golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1
406406
golang.org/x/mobile => golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6
407-
golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
407+
golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
408408
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
409409
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
410410
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMx
410410
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 h1:rJm0LuqUjoDhSk2zO9ISMSToQxGz7Os2jRiOL8AWu4c=
411411
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
412412
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
413-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80=
414-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
413+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
414+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
415415
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
416416
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
417417
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=

‎staging/src/k8s.io/api/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apimachinery/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/pmezard/go-difflib v1.0.0 // indirect
2626
github.com/spf13/pflag v1.0.1
2727
github.com/stretchr/testify v1.2.2
28-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
28+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
2929
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
3030
golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect
3131
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect

‎staging/src/k8s.io/apimachinery/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df // indirect
5050
go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 // indirect
5151
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
52-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
52+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
5353
google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 // indirect
5454
google.golang.org/grpc v1.13.0
5555
gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7

‎staging/src/k8s.io/apiserver/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cli-runtime/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/client-go/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/spf13/pflag v1.0.1
2323
github.com/stretchr/testify v1.2.2
2424
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
25-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
25+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
2626
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
2727
golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
2828
google.golang.org/appengine v1.5.0 // indirect

‎staging/src/k8s.io/client-go/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cloud-provider/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cluster-bootstrap/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/component-base/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cri-api/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/golang/protobuf v1.2.0 // indirect
1212
github.com/pmezard/go-difflib v1.0.0 // indirect
1313
github.com/stretchr/testify v1.2.2
14-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
14+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
1515
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
1616
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
1717
google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 // indirect

‎staging/src/k8s.io/cri-api/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/csi-translation-lib/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kube-aggregator/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937
1515
github.com/spf13/pflag v1.0.1
1616
github.com/stretchr/testify v1.2.2
17-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
17+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
1818
k8s.io/api v0.0.0
1919
k8s.io/apimachinery v0.0.0
2020
k8s.io/apiserver v0.0.0

‎staging/src/k8s.io/kube-aggregator/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kube-controller-manager/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kube-proxy/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)