From c6f3777976ad41969cab7106d133125e65d04d05 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 10 May 2019 19:28:48 -0700 Subject: [PATCH] Merge pull request #77753 from liggitt/prune-replace Prune matching replace directives in staging repos more effectively Kubernetes-commit: 6f6890b09e2a8ae7eaaea0a5052d45c3960e1c76 --- Godeps/Godeps.json | 4 ++-- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e724ce7a..b5fa555c 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -184,11 +184,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0cde1e56adb1" + "Rev": "e63b5755afac" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "7d8f8feb49c5" + "Rev": "ad85901afca0" }, { "ImportPath": "k8s.io/klog", diff --git a/go.mod b/go.mod index 79d13904..2e70d487 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a golang.org/x/time v0.0.0-20161028155119-f51c12702a4d google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20190511023547-e63b5755afac + k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0 k8s.io/klog v0.3.0 k8s.io/utils v0.0.0-20190221042446-c2654d5206da sigs.k8s.io/yaml v1.1.0 @@ -37,7 +37,6 @@ 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/api => k8s.io/api v0.0.0-20190511023547-e63b5755afac + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0 ) diff --git a/go.sum b/go.sum index 1de81bd9..e234aad9 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep 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/api v0.0.0-20190511023547-e63b5755afac/go.mod h1:f265Ep4XvHtyggfaaNhtP0AtAFilBaXq2fPjm5kYxwI= +k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw= 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 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=