Merge pull request #77753 from liggitt/prune-replace

Prune matching replace directives in staging repos more effectively

Kubernetes-commit: 6f6890b09e2a8ae7eaaea0a5052d45c3960e1c76
This commit is contained in:
Kubernetes Publisher 2019-05-10 19:28:48 -07:00
commit b77cf80c6c
3 changed files with 9 additions and 9 deletions

4
Godeps/Godeps.json generated
View File

@ -164,11 +164,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "7d8f8feb49c5"
"Rev": "ad85901afca0"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "37ac68324a2e"
"Rev": "91ee9e34fdd1"
},
{
"ImportPath": "k8s.io/klog",

10
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5
k8s.io/component-base v0.0.0-20190510223729-37ac68324a2e
k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1
)
replace (
@ -14,8 +14,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/apimachinery => k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5
k8s.io/component-base => k8s.io/component-base v0.0.0-20190510223729-37ac68324a2e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
k8s.io/component-base => k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1
)
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190510223910-296882b37772
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190511024206-d49804050482

4
go.sum
View File

@ -54,8 +54,8 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/component-base v0.0.0-20190510223729-37ac68324a2e/go.mod h1:Y8xLK8RovaTum8o7Bfsnzzo0jVTPg241kCziI8bTCDk=
k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1/go.mod h1:hlLSedoHFjaibpkg18jYZ0v6lpuhbLAVfenuqtu3Hrk=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=