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. Deleting CHANGELOG-1.13.md CHANGELOG-1.14.md CHANGELOG-1.15.md 

Kubernetes-commit: 92639f719ee353219fa2cd19128a93409bb3a1e3
This commit is contained in:
Kubernetes Publisher 2019-08-20 03:48:09 -04:00
parent fe652460cd
commit 8e5e1ef301
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -220,7 +220,7 @@
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "aa82965741a9"
"Rev": "6c7e314b6563"
},
{
"ImportPath": "gopkg.in/check.v1",
@ -244,11 +244,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d4a3b9129e40"
"Rev": "31b1e1ea64dc"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "276f0f49dbc8"
"Rev": "74b38ad9c4f2"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -5,15 +5,14 @@ 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-20190820074809-31b1e1ea64dc
k8s.io/component-base v0.0.0-20190820074809-74b38ad9c4f2
)
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/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
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-20190820074809-31b1e1ea64dc
k8s.io/component-base => k8s.io/component-base v0.0.0-20190820074809-74b38ad9c4f2
)

2
go.sum
View File

@ -98,6 +98,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc/go.mod h1:EZoIMuAgG/4v58YL+bz0kqnivqupk28fKYxFCa5e6X8=
k8s.io/component-base v0.0.0-20190820074809-74b38ad9c4f2/go.mod h1:sX8l824WMqJToFlH91vYHLndk6FBNaIkNP41tEPkaqI=
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=