Merge pull request #78931 from krzysied/revert-78465-bump-klog

Revert "Bump klog to v0.3.2"

Kubernetes-commit: 9b15a5b0700724d2ea1021ceafb72c378b638a0b
This commit is contained in:
Kubernetes Publisher 2019-06-12 05:03:29 -07:00
parent fde8afcae1
commit 47e7f1db5d
3 changed files with 11 additions and 8 deletions

6
Godeps/Godeps.json generated
View File

@ -168,15 +168,15 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "859a0ba5e71a"
"Rev": "6a5db36e93ad"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "103ccccb7a11"
"Rev": "4062e14deebe"
},
{
"ImportPath": "k8s.io/klog",
"Rev": "v0.3.2"
"Rev": "v0.3.1"
},
{
"ImportPath": "k8s.io/kube-openapi",

11
go.mod
View File

@ -5,15 +5,16 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
k8s.io/component-base v0.0.0-20190612130303-4062e14deebe
)
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 => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
k8s.io/component-base => k8s.io/component-base v0.0.0-20190612130303-4062e14deebe
)
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190612130503-88b97c97967f

2
go.sum
View File

@ -56,6 +56,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-20190612125636-6a5db36e93ad/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
k8s.io/component-base v0.0.0-20190612130303-4062e14deebe/go.mod h1:MmIDXnint3qMN0cqXHKrSiJ2XQKo3J1BPIz7in7NvO0=
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/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=