Merge pull request #20954 from gnufied/cherry-pick-recyler

UPSTREAM: <carry>: simplify kube-controller-manager patches
openshift · Sep 12, 2018 · f54abfd · f54abfd
2 parents a3024f8 + 817d286
commit f54abfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 112 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_recycler.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_recycler.go