Merge pull request #14595 from deads2k/agg-07-check

Merged by openshift-bot
openshift · Jun 15, 2017 · 22d5284 · 22d5284
2 parents ec11c0d + 48d3654
commit 22d5284
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 5 deletions.
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
diff --git a/...es/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go b/...es/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go