Merge pull request #20274 from liggitt/delete-background

UPSTREAM: 65908: switch delete strategy to background deletion
openshift · Jul 10, 2018 · d5c018b · d5c018b
2 parents 328513e + 9862c58
commit d5c018b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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/delete_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete_test.go