Merge pull request #15066 from fabianofranz/issues_15017

Merged by openshift-bot
openshift · Jul 7, 2017 · 83efc33 · 83efc33
2 parents 41a97d2 + 063b275
commit 83efc33
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 3 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/apply_test.go