Merge pull request #20305 from deads2k/test-04-delete-fix

UPSTREAM: 00000: make delete waits match on UID
openshift · Jul 12, 2018 · 5fa553e · 5fa553e
2 parents 3af079d + 7cca473
commit 5fa553e
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 12 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/wait/wait.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/wait/wait.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/wait/wait_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/wait/wait_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource/helper.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource/helper.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource/helper_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource/helper_test.go