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

Kubernetes-commit: 034eb142bf826a667ab01d95b5c09268273b58dd
This commit is contained in:
Kubernetes Publisher
2019-11-16 18:22:09 +00:00
parent beefa56cb8
commit e0cf0d287d
3 changed files with 15 additions and 12 deletions
+8 -9
View File
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.12
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-20191115142644-28bee1a9beb0
k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec
k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6
k8s.io/code-generator v0.0.0-20191115142644-65da3bb30b8d
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-20191115142644-28bee1a9beb0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec
k8s.io/client-go => k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191115142644-65da3bb30b8d
)