Merge pull request openshift#18797 from tnozicka/upstream-59365

UPSTREAM: 59365: Fix StatefulSet set-based selector bug
jpeeler · Mar 5, 2018 · 3addbb0 · 3addbb0
2 parents a814121 + c8ab4e8
commit 3addbb0
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 149 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/history/controller_history.go b/vendor/k8s.io/kubernetes/pkg/controller/history/controller_history.go