Skip to content

Commit 38297c3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents ab12b8b + 111a497 commit 38297c3

File tree

4 files changed

+170
-10
lines changed

4 files changed

+170
-10
lines changed

‎vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/operations.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/integration/garbagecollector/cluster_scoped_owner_test.go

Lines changed: 156 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/integration/garbagecollector/garbage_collector_test.go

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)