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

Kubernetes-commit: ecd7e4cab747770f5c362ace9bd3487bdb97c66b
This commit is contained in:
Kubernetes Publisher
2019-08-26 12:20:12 +00:00
parent aef24b06d3
commit eed36b4378
3 changed files with 17 additions and 14 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-20190826115149-8408f7c78273
k8s.io/apimachinery v0.0.0-20190826044806-2323990d016a
k8s.io/client-go v0.0.0-20190826044806-66eec82cbac1
k8s.io/code-generator v0.0.0-20190826044806-bdcfe8d36feb
k8s.io/klog v0.4.0
)
@@ -17,9 +17,8 @@ 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/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
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-20190826115149-8408f7c78273
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190826044806-2323990d016a
k8s.io/client-go => k8s.io/client-go v0.0.0-20190826044806-66eec82cbac1
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190826044806-bdcfe8d36feb
)