Merge pull request #18814 from gmarek/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-17 02:55:59 -08:00
commit 1357525d97

View File

@ -56,7 +56,8 @@ function startApiServer() {
--service-cluster-ip-range="10.0.0.0/24" 1>&2 &
APISERVER_PID=$!
kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: "
# url, prefix, wait, times
kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: " 1 45
}
function killApiServer() {