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

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
parent d03f417934 9c2ac0da61
commit d28722dbb4
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -408,19 +408,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "c2f1300cac21" "Rev": "9eb4726e83e4"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "c02527fc3bc6" "Rev": "7dcd37fca543"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "0df29606e0e8" "Rev": "4dc5e1154b7f"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "fd5d14dd6d20" "Rev": "dfaf58e38083"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",

19
go.mod
View File

@ -22,7 +22,7 @@ require (
github.com/go-openapi/jsonreference v0.19.0 // indirect github.com/go-openapi/jsonreference v0.19.0 // indirect
github.com/go-openapi/spec v0.17.2 github.com/go-openapi/spec v0.17.2
github.com/go-openapi/swag v0.17.2 // indirect github.com/go-openapi/swag v0.17.2 // indirect
github.com/gogo/protobuf v1.1.1 github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/google/go-cmp v0.2.0 // indirect github.com/google/go-cmp v0.2.0 // indirect
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf
@ -62,10 +62,10 @@ require (
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
gopkg.in/yaml.v2 v2.2.1 gopkg.in/yaml.v2 v2.2.1
gotest.tools v2.2.0+incompatible // indirect gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20190415132514-c2f1300cac21 k8s.io/api v0.0.0-20190416052506-9eb4726e83e4
k8s.io/apimachinery v0.0.0-20190416052411-c02527fc3bc6 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/component-base v0.0.0-20190415133015-fd5d14dd6d20 k8s.io/component-base v0.0.0-20190416053005-dfaf58e38083
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
k8s.io/utils v0.0.0-20190221042446-c2654d5206da k8s.io/utils v0.0.0-20190221042446-c2654d5206da
@ -74,12 +74,11 @@ require (
) )
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-20190416052411-c02527fc3bc6 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/component-base => k8s.io/component-base v0.0.0-20190415133015-fd5d14dd6d20 k8s.io/component-base => k8s.io/component-base v0.0.0-20190416053005-dfaf58e38083
) )

8
go.sum
View File

@ -194,10 +194,10 @@ 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=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
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-20190416052411-c02527fc3bc6/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/component-base v0.0.0-20190415133015-fd5d14dd6d20/go.mod h1:/MeTGju16bPcYaL2sAuXlajPGS52tNeWKUMoLMLgc3o= k8s.io/component-base v0.0.0-20190416053005-dfaf58e38083/go.mod h1:jDENR2BIf8zDnGHKHsHDcdTFfqs+E10E+h8c4UXuJFg=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=