Merge pull request #87442 from jennybuckley/smd-3

Update structured-merge-diff dependency to v3

Kubernetes-commit: 03cb6afc1a7d43e8ea034279a19801d3d3fb17b3
This commit is contained in:
Kubernetes Publisher
2020-01-22 20:37:26 -08:00
parent 5605e8990d
commit bd4ff3d8ad
3 changed files with 19 additions and 16 deletions
+8 -9
View File
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
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-20200123072230-4a8a79a10e72
k8s.io/apimachinery v0.0.0-20200123072051-a8b8767d8a3b
k8s.io/client-go v0.0.0-20200123072453-dbf12d30bab2
k8s.io/code-generator v0.0.0-20200123071906-cb8b34f032ea
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
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-20200123072230-4a8a79a10e72
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200123072051-a8b8767d8a3b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200123072453-dbf12d30bab2
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200123071906-cb8b34f032ea
)