Merge pull request #14274 from deads2k/controller-05-namespace

Merged by openshift-bot
openshift · May 23, 2017 · 6ca1528 · 6ca1528
2 parents 9fbc432 + 165df96
commit 6ca1528
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go