Merge pull request #19213 from juanvallejo/jvallejo/pick-upstream-61378

UPSTREAM: 61378: `--force` only takes effect when `--grace-period=0`
openshift · May 29, 2018 · 6d89588 · 6d89588
2 parents 836f8e3 + 5cc1fda
commit 6d89588
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go