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

Kubernetes-commit: 1aea0dd9383a2f7ac9f7e055ff10a08ea241db51
This commit is contained in:
Kubernetes Publisher
2019-08-28 16:08:52 +00:00
parent edceb5070c
commit 5d1b22f67b
3 changed files with 76 additions and 17 deletions
+8 -9
View File
@@ -5,10 +5,10 @@ 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-20190828114644-535404967fc8
k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030
k8s.io/client-go v0.0.0-20190828155339-960df9c23167
k8s.io/code-generator v0.0.0-20190828114644-668f4934badc
k8s.io/klog v0.4.0
)
@@ -20,9 +20,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
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-20190828114644-535404967fc8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030
k8s.io/client-go => k8s.io/client-go v0.0.0-20190828155339-960df9c23167
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190828114644-668f4934badc
)