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

Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3
This commit is contained in:
Kubernetes Publisher
2019-06-12 21:16:27 +00:00
parent 4d7aa1c825
commit efb1d42b6e
3 changed files with 19 additions and 14 deletions
+10 -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-20190612210016-7525909cc6da
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go v0.0.0-20190612210332-e4cdb82809fc
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/klog v0.3.1
)
@@ -16,9 +16,10 @@ 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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
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-20190612210016-7525909cc6da
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go => k8s.io/client-go v0.0.0-20190612210332-e4cdb82809fc
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190612210728-f40f68634749