Merge pull request #17820 from liggitt/cluster-scoped-owners-3.9

Automatic merge from submit-queue (batch tested with PRs 17699, 17820). UPSTREAM: 57211: Process cluster-scoped owners correctly
openshift · Jan 5, 2018 · ee37719 · ee37719
2 parents ceb0625 + 945fda7
commit ee37719
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 8 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