Merge pull request #20234 from mml/update-objects

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-30 07:32:25 -08:00
commit e4c5f892c6

View File

@ -62,10 +62,11 @@ function startApiServer() {
function killApiServer() {
kube::log::status "Killing api server"
[[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
if [[ -n ${APISERVER_PID-} ]]; then
kill ${APISERVER_PID} 1>&2 2>/dev/null
wait ${APISERVER_PID} || true
kube::log::status "api server exited"
fi
unset APISERVER_PID
}