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 ecd98cdbab
commit f1fd2be855
3 changed files with 17 additions and 14 deletions

10
Godeps/Godeps.json generated
View File

@ -276,7 +276,7 @@
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "aa82965741a9"
"Rev": "6e04913cbbac"
},
{
"ImportPath": "gonum.org/v1/gonum",
@ -312,19 +312,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "8eee47dbc9ed"
"Rev": "3efd428ce51b"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d4a3b9129e40"
"Rev": "31b1e1ea64dc"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "a240a565b073"
"Rev": "2597db3f9d08"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "6ce24b93cb87"
"Rev": "060a3d12ce80"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20190820101204-3efd428ce51b
k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc
k8s.io/client-go v0.0.0-20190820102012-2597db3f9d08
k8s.io/code-generator v0.0.0-20190820100630-060a3d12ce80
k8s.io/klog v0.4.0
)
@ -17,9 +17,8 @@ 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/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20190820101204-3efd428ce51b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc
k8s.io/client-go => k8s.io/client-go v0.0.0-20190820102012-2597db3f9d08
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190820100630-060a3d12ce80
)

4
go.sum
View File

@ -167,6 +167,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.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190820101204-3efd428ce51b/go.mod h1:Qzk+0nJ70fr1C/s9u/hmb27VzsPJbMXp/85hMFbyuZ4=
k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc/go.mod h1:EZoIMuAgG/4v58YL+bz0kqnivqupk28fKYxFCa5e6X8=
k8s.io/client-go v0.0.0-20190820102012-2597db3f9d08/go.mod h1:2OquKG6cDS3ijMIMA2UwZx44kxEMJeZd6f3RtlezYJM=
k8s.io/code-generator v0.0.0-20190820100630-060a3d12ce80/go.mod h1:cGLmodO4Xf0bnfw8/mLEXWYjiT5N9RFA9NzrYzP8VhM=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190813173942-955ffa8fcfc9 h1:/gJp8cw8+k4AxBNGZ5u5eRoCOzH3WVpY02K654HNiyU=