Merge pull request #14474 from deads2k/client-ca-retry

Merged by openshift-bot
openshift · Jun 8, 2017 · ba62cde · ba62cde
2 parents c824f5c + 87fb311
commit ba62cde
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/master/client_ca_hook.go b/vendor/k8s.io/kubernetes/pkg/master/client_ca_hook.go
diff --git a/vendor/k8s.io/kubernetes/pkg/master/client_ca_hook_test.go b/vendor/k8s.io/kubernetes/pkg/master/client_ca_hook_test.go