Merge pull request #16105 from deads2k/server-38-finalizer

Automatic merge from submit-queue (batch tested with PRs 16052, 16105, 14319, 16106, 16104) UPSTREAM: 51148: Enable finalizers independent of GC enablement From openshift/origin: `hack/cherry-pick.sh 511481`
openshift · Sep 2, 2017 · 41eeb79 · 41eeb79
2 parents 089f921 + 4c46e1e
commit 41eeb79
Show file tree

Hide file tree

Showing 2 changed files with 135 additions and 190 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go
diff --git a/...8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go b/...8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go