Merge pull request #17818 from liggitt/cluster-scoped-owners-3.7

Automatic merge from submit-queue. UPSTREAM: 57211: Process cluster-scoped owners correctly fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525699
openshift · Jan 7, 2018 · 38297c3 · 38297c3
2 parents ab12b8b + 111a497
commit 38297c3
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/operations.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/operations.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/garbagecollector/cluster_scoped_owner_test.go b/vendor/k8s.io/kubernetes/test/integration/garbagecollector/cluster_scoped_owner_test.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/garbagecollector/garbage_collector_test.go b/vendor/k8s.io/kubernetes/test/integration/garbagecollector/garbage_collector_test.go