Merge pull request #13005 from soltysh/cherrypick_41658

Merged by openshift-bot
openshift · Feb 19, 2017 · 0aa6ba1 · 0aa6ba1
2 parents fb6905d + adb3eb8
commit 0aa6ba1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go