Merge pull request #20999 from deads2k/agg-01-master-available

UPSTREAM: 68678: tighten maximum retry loop for aggregate api availability
openshift · Sep 18, 2018 · 6cac71b · 6cac71b
2 parents 301458a + 183457c
commit 6cac71b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ernetes/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go b/...ernetes/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go