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.14 

Kubernetes-commit: 9ef24c9b016648e842673a7f5570de4f6af04439
This commit is contained in:
Kubernetes Publisher 2019-03-11 09:35:42 +00:00
parent f95108bb09
commit 1d539108c3
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Godeps/Godeps.json generated
View File

@ -56,95 +56,95 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "b9c2f0e2d96f43c955e4ebf280b1466e7e35304a" "Rev": "52b84f9b724722e77633d2fe022d2d8d57bb16a9"
}, },
{ {
"ImportPath": "k8s.io/component-base/config", "ImportPath": "k8s.io/component-base/config",
"Rev": "b96c1720a39c387e186a0ff167bb0ba1023e6ac3" "Rev": "923e373b2c7ebc95cf3dc5444798c4995ff780b7"
}, },
{ {
"ImportPath": "k8s.io/component-base/config/v1alpha1", "ImportPath": "k8s.io/component-base/config/v1alpha1",
"Rev": "b96c1720a39c387e186a0ff167bb0ba1023e6ac3" "Rev": "923e373b2c7ebc95cf3dc5444798c4995ff780b7"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",