Merge pull request #76610 from liggitt/bump-proto

github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415

Kubernetes-commit: 701e36bd5bc265174ac9c4ce983dcc044e5bad53
This commit is contained in:
Kubernetes Publisher 2019-04-15 22:19:35 -07:00
commit 85928f7c36
3 changed files with 17 additions and 18 deletions

8
Godeps/Godeps.json generated
View File

@ -212,19 +212,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "c2f1300cac21" "Rev": "9eb4726e83e4"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "07d458fe0356" "Rev": "7dcd37fca543"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "0df29606e0e8" "Rev": "4dc5e1154b7f"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "821be5c9cfe4" "Rev": "01a054e913a9"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

19
go.mod
View File

@ -5,22 +5,21 @@ module k8s.io/sample-controller
go 1.12 go 1.12
require ( require (
k8s.io/api v0.0.0-20190415132514-c2f1300cac21 k8s.io/api v0.0.0-20190416052506-9eb4726e83e4
k8s.io/apimachinery v0.0.0-20190415132420-07d458fe0356 k8s.io/apimachinery v0.0.0-20190416052411-7dcd37fca543
k8s.io/client-go v0.0.0-20190415132652-0df29606e0e8 k8s.io/client-go v0.0.0-20190416052645-4dc5e1154b7f
k8s.io/code-generator v0.0.0-20190416012315-821be5c9cfe4 k8s.io/code-generator v0.0.0-20190416052311-01a054e913a9
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
) )
replace ( replace (
github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415
github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 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 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20190415132514-c2f1300cac21 k8s.io/api => k8s.io/api v0.0.0-20190416052506-9eb4726e83e4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190415132420-07d458fe0356 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190416052411-7dcd37fca543
k8s.io/client-go => k8s.io/client-go v0.0.0-20190415132652-0df29606e0e8 k8s.io/client-go => k8s.io/client-go v0.0.0-20190416052645-4dc5e1154b7f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190416012315-821be5c9cfe4 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190416052311-01a054e913a9
) )
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190415133015-fd5d14dd6d20 replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190416053005-dfaf58e38083

8
go.sum
View File

@ -87,10 +87,10 @@ 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/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 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190415132514-c2f1300cac21/go.mod h1:5HMaKNcWJji8AGOBjOZxmFDwRutMItn4MrrXZcFANNo= k8s.io/api v0.0.0-20190416052506-9eb4726e83e4/go.mod h1:nJHKpen/IlzCxaNUus2Fsq8PBfEGAgPcxk2jjTgmWPI=
k8s.io/apimachinery v0.0.0-20190415132420-07d458fe0356/go.mod h1:jLjiXl596L+wVGdx8dRx6sSNnabzqnI2+nAJqqqyesQ= k8s.io/apimachinery v0.0.0-20190416052411-7dcd37fca543/go.mod h1:nA8FPV/rCPAeocBtmWZnuCgRQZQNgt0BySQokvuOgVI=
k8s.io/client-go v0.0.0-20190415132652-0df29606e0e8/go.mod h1:adtBgFzDjiIPqoaFQ5an7OZCfFu+io4XajNOlr+FAxA= k8s.io/client-go v0.0.0-20190416052645-4dc5e1154b7f/go.mod h1:u9FbEU8/63b3xvIwyt7e1DtoPqzsOKJ8hoc0Uif+2jI=
k8s.io/code-generator v0.0.0-20190416012315-821be5c9cfe4/go.mod h1:HURHo+BaZvrjm6DIST3jWY+eeitiILOLFd/uQL1jxWE= k8s.io/code-generator v0.0.0-20190416052311-01a054e913a9/go.mod h1:6a07iUCUWB1tykSctOVKTgzqTeUuHn5KrusWzAYtRFY=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA=