From 5c45477a8ae75e66d03770322595f6adced69e13 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 12 Jun 2019 05:03:29 -0700 Subject: [PATCH] Merge pull request #78931 from krzysied/revert-78465-bump-klog Revert "Bump klog to v0.3.2" Kubernetes-commit: 9b15a5b0700724d2ea1021ceafb72c378b638a0b --- Godeps/Godeps.json | 6 +++--- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 9b25fb24..5e17923a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -188,15 +188,15 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "c1e9adbde704" + "Rev": "db0771252981" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "c0632ccbde11" + "Rev": "6a5db36e93ad" }, { "ImportPath": "k8s.io/klog", - "Rev": "v0.3.2" + "Rev": "v0.3.1" }, { "ImportPath": "k8s.io/kube-openapi", diff --git a/go.mod b/go.mod index cfd038a1..97fd411a 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-20190612125737-db0771252981 + k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad k8s.io/klog v0.3.1 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-20190612125737-db0771252981 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad ) diff --git a/go.sum b/go.sum index 5e2bb548..064841fc 100644 --- a/go.sum +++ b/go.sum @@ -91,6 +91,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-20190612125737-db0771252981/go.mod h1:SR4nMi8IQTDnEi4768MsMCoZ9DyfRls7wy+TbRrFicA= +k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68= k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=