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

Kubernetes-commit: 92639f719ee353219fa2cd19128a93409bb3a1e3
This commit is contained in:
Kubernetes Publisher
2019-08-20 10:39:46 +00:00
parent ecd98cdbab
commit f1fd2be855
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-20190820101204-3efd428ce51b
k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc
k8s.io/client-go v0.0.0-20190820102012-2597db3f9d08
k8s.io/code-generator v0.0.0-20190820100630-060a3d12ce80
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-20190820101204-3efd428ce51b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc
k8s.io/client-go => k8s.io/client-go v0.0.0-20190820102012-2597db3f9d08
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190820100630-060a3d12ce80
)