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

Kubernetes-commit: ee5e5d216da4d3ec8106e3cfc1507599b8787b7b
This commit is contained in:
Kubernetes Publisher
2020-03-04 20:49:54 +00:00
parent 43ac6031e7
commit 331469446e
3 changed files with 16 additions and 13 deletions
+8 -9
View File
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
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/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 => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
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
)