Merge pull request #17690 from openshift-cherrypick-robot/cherry-pick…

…-17663-to-release-3.8 Automatic merge from submit-queue. Automated cherry-pick of #17663 on release-3.8 This is an automated cherry-pick of #17663 /assign deads2k
openshift · Dec 16, 2017 · cc39bcd · cc39bcd
2 parents a050d41 + 08eff77
commit cc39bcd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 81 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-apiserver.go b/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-apiserver.go
diff --git a/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-controller-manager.go b/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-controller-manager.go
diff --git a/vendor/k8s.io/kubernetes/cmd/hyperkube/main.go b/vendor/k8s.io/kubernetes/cmd/hyperkube/main.go