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

Kubernetes-commit: 03aacded1e0e8e9ebf2a84039f02433bb7b38bd0
This commit is contained in:
Kubernetes Publisher 2018-11-12 16:37:58 +08:00
parent 1631a14432 c7d61f15eb
commit c7b58a8a6b
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Godeps/Godeps.json generated
View File

@ -14,10 +14,6 @@
"ImportPath": "github.com/gogo/protobuf/sortkeys", "ImportPath": "github.com/gogo/protobuf/sortkeys",
"Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02" "Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02"
}, },
{
"ImportPath": "github.com/golang/glog",
"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
},
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",
"Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c" "Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c"
@ -60,103 +56,107 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/config", "ImportPath": "k8s.io/apimachinery/pkg/apis/config",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "2294379ca990315f30d7cc972571fcbec0b03c10" "Rev": "b4d512b8cf5322ed3ae6f790fd07125415b87e2b"
}, },
{ {
"ImportPath": "k8s.io/apiserver/pkg/apis/config", "ImportPath": "k8s.io/apiserver/pkg/apis/config",
"Rev": "fd98ae32ad245560508ec6cc9542c39cf5e19514" "Rev": "2bdd3260cc08381b25f807fbe9f91953d542b5bd"
}, },
{ {
"ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1", "ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1",
"Rev": "fd98ae32ad245560508ec6cc9542c39cf5e19514" "Rev": "2bdd3260cc08381b25f807fbe9f91953d542b5bd"
},
{
"ImportPath": "k8s.io/klog",
"Rev": "8139d8cb77af419532b33dfa7dd09fbc5f1d344f"
}, },
{ {
"ImportPath": "k8s.io/utils/pointer", "ImportPath": "k8s.io/utils/pointer",