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

Kubernetes-commit: 57ce516fdc0eec9b7a8ff2e591f4550a3060ee09
This commit is contained in:
Kubernetes Publisher
2019-11-08 11:26:54 +00:00
parent 60c52f0115
commit f433da5d9f
3 changed files with 17 additions and 14 deletions
+8 -9
View File
@@ -5,19 +5,18 @@ 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-20191108101507-5d8c3d1f60af
k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177
k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df
k8s.io/code-generator v0.0.0-20191108105555-8b39d7f75b89
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20191108101507-5d8c3d1f60af
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177
k8s.io/client-go => k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191108105555-8b39d7f75b89
)