Merge pull request #83434 from liggitt/automated-cherry-pick-of-#83261-upstream-release-1.15

[1.15] Automated cherry pick of #83261: bump gopkg.in/yaml.v2 v2.2.4

Kubernetes-commit: 9a83f46a506124685802559c4a3981f4f415d1de
This commit is contained in:
Kubernetes Publisher
2019-10-04 12:29:09 +00:00
parent 5af18f126a
commit f886b06a2e
3 changed files with 16 additions and 13 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-20191004120003-3a12735a829a
k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
k8s.io/client-go v0.0.0-20191004120415-b2f42092e376
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/klog v0.3.1
)
@@ -16,9 +16,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/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-20191004120003-3a12735a829a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
k8s.io/client-go => k8s.io/client-go v0.0.0-20191004120415-b2f42092e376
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
)