kubernetes
/
kubelet
mirror of https://github.com/kubernetes/kubelet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Update golang/x/net dependency on release-1.15

Kubernetes-commit: 2d3c76f9091b6bec110a5e63777c332469e0cba2
This commit is contained in:
Kubernetes Publisher 2019-08-16 16:14:10 -07:00
parent ba97c355c3
commit c0169fe3a9
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -100,7 +100,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "65e2d4e15006"
"Rev": "cdfb69ac37fc"
},
{
"ImportPath": "golang.org/x/sync",
@ -140,11 +140,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "7525909cc6da"
"Rev": "e14a4b1f5f84"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1799e75a0719"
"Rev": "f2f3a405f61d"
},
{
"ImportPath": "k8s.io/klog",

9
go.mod
View File

@ -5,15 +5,14 @@ module k8s.io/kubelet
go 1.12
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20190817021128-e14a4b1f5f84
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
)
replace (
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
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/kubelet => ../kubelet
k8s.io/api => k8s.io/api v0.0.0-20190817021128-e14a4b1f5f84
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
)

2
go.sum
View File

@ -48,6 +48,8 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190817021128-e14a4b1f5f84/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo=
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=