Merge pull request #17978 from sjenning/pick-56971

Automatic merge from submit-queue. UPSTREAM: 56971: LimitRange ignores objects previously marked for deletion kubernetes/kubernetes#56971 xref https://bugzilla.redhat.com/show_bug.cgi?id=1509309 @derekwaynecarr
openshift · Jan 5, 2018 · 5223c66 · 5223c66
2 parents 6dc51d9 + 7f0f4d5
commit 5223c66
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/limitranger/admission.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/limitranger/admission.go
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/limitranger/admission_test.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/limitranger/admission_test.go