Merge remote-tracking branch 'origin/master' into release-1.18

Kubernetes-commit: df00300353342181f7930d81c197f52b0d6164de
This commit is contained in:
Kubernetes Publisher
2020-03-06 20:56:15 +00:00
parent 1357d00961
commit 4272ebdfb8
3 changed files with 16 additions and 16 deletions
+8 -8
View File
@@ -5,18 +5,18 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0-20200304180238-b7e08103f9c2
k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36
k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f
k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
k8s.io/api v0.0.0-20200306170923-e4148040f8d3
k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb
k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa
k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200304180238-b7e08103f9c2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200304180238-7c34f3d03f36
k8s.io/client-go => k8s.io/client-go v0.0.0-20200304180238-c2cd954c1a7f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
k8s.io/api => k8s.io/api v0.0.0-20200306170923-e4148040f8d3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb
k8s.io/client-go => k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
)