kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.16 

Kubernetes-commit: 14761b020eadfaaf7864d39aca79c0fc089c609f
This commit is contained in:
Kubernetes Publisher 2019-08-29 12:32:50 +00:00
parent d1d2c21e2b
commit af2a170d7c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -372,7 +372,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "535404967fc8"
"Rev": "0ee0e08ff27c"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -380,11 +380,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "960df9c23167"
"Rev": "8666a3c21262"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "b635e5567b37"
"Rev": "52a5b2415085"
},
{
"ImportPath": "k8s.io/gengo",

8
go.mod
View File

@ -6,7 +6,7 @@ go 1.12
require (
k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030
k8s.io/component-base v0.0.0-20190828155824-b635e5567b37
k8s.io/component-base v0.0.0-20190829123250-52a5b2415085
)
replace (
@ -17,8 +17,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
k8s.io/api => k8s.io/api v0.0.0-20190828114644-535404967fc8
k8s.io/api => k8s.io/api v0.0.0-20190829123250-0ee0e08ff27c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030
k8s.io/client-go => k8s.io/client-go v0.0.0-20190828155339-960df9c23167
k8s.io/component-base => k8s.io/component-base v0.0.0-20190828155824-b635e5567b37
k8s.io/client-go => k8s.io/client-go v0.0.0-20190829123250-8666a3c21262
k8s.io/component-base => k8s.io/component-base v0.0.0-20190829123250-52a5b2415085
)

6
go.sum
View File

@ -150,10 +150,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20190828114644-535404967fc8/go.mod h1:FQukhkwVOpEleIcV72hAUmhlQ4bTU+jINB0rwQOlkk0=
k8s.io/api v0.0.0-20190829123250-0ee0e08ff27c/go.mod h1:FQukhkwVOpEleIcV72hAUmhlQ4bTU+jINB0rwQOlkk0=
k8s.io/apimachinery v0.0.0-20190828114644-35bd9ae31030/go.mod h1:OOC7vMsHyCzra5xu6r1bRXkXMH76iww9BeHOAAJof4U=
k8s.io/client-go v0.0.0-20190828155339-960df9c23167/go.mod h1:VtDnEQdjbHWYVE1s5RToeS51c3+aoDs/G83GsAGepcE=
k8s.io/component-base v0.0.0-20190828155824-b635e5567b37/go.mod h1:/3z1c9T/H3yxg73FeGSphb1AFtPsLKKZr5twBgKLxTQ=
k8s.io/client-go v0.0.0-20190829123250-8666a3c21262/go.mod h1:E1CnhETv2vD79Q3kWV2e7XZNTudVZgtaCjSoA8aLYNA=
k8s.io/component-base v0.0.0-20190829123250-52a5b2415085/go.mod h1:H5OYzQuOJdm9tQWMgcM+rIN4FaLR7Vh1WNc2e2XRxmQ=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=