Merge remote-tracking branch 'origin/master' into release-1.15. Deleting CHANGELOG-1.14.md

Kubernetes-commit: 5991262b24f5e834654716148c939624536cce3a
This commit is contained in:
Kubernetes Publisher
2019-05-28 16:05:40 +00:00
parent 282a604802
commit 01c477d05a
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-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/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-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
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190528155601-e3d0eeb0e901