Merge pull request #5720 from derekwaynecarr/16818

Merged by openshift-bot
openshift · Nov 6, 2015 · 9bd5fb9 · 9bd5fb9
2 parents fcbe319 + 2dad8c4
commit 9bd5fb9
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 19 deletions.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go
diff --git a/...ps/_workspace/src/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller_test.go b/...ps/_workspace/src/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller_test.go