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

Kubernetes-commit: 67f7c9f6ff8e61b44bd62db9ba6e0660b38c0617
This commit is contained in:
Kubernetes Publisher
2019-05-31 13:48:58 +00:00
parent 5377b2aaa3
commit 5735651eb7
3 changed files with 16 additions and 16 deletions
+8 -8
View File
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0-20190528154556-576cfa93bfcf
k8s.io/apimachinery v0.0.0-20190528154421-587ae2000094
k8s.io/client-go v0.0.0-20190523093902-1d2c64df009d
k8s.io/code-generator v0.0.0-20190528154225-a9f578f3d62a
k8s.io/api v0.0.0-20190530045707-0e6216c20e2a
k8s.io/apimachinery v0.0.0-20190530045707-5a4f0be056b6
k8s.io/client-go v0.0.0-20190530045707-f6af94938bac
k8s.io/code-generator v0.0.0-20190530045707-fe11eb7d691c
k8s.io/klog v0.3.1
)
@@ -16,10 +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 => k8s.io/api v0.0.0-20190528154556-576cfa93bfcf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190528154421-587ae2000094
k8s.io/client-go => k8s.io/client-go v0.0.0-20190523093902-1d2c64df009d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190528154225-a9f578f3d62a
k8s.io/api => k8s.io/api v0.0.0-20190530045707-0e6216c20e2a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190530045707-5a4f0be056b6
k8s.io/client-go => k8s.io/client-go v0.0.0-20190530045707-f6af94938bac
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190530045707-fe11eb7d691c
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190528155601-e3d0eeb0e901