github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20234 from mml/update-objects

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-30 07:32:25 -08:00
commit e4c5f892c6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/test-update-storage-objects.sh
View File

@ -62,10 +62,11 @@ function startApiServer() {
function killApiServer() { function killApiServer() {
kube::log::status "Killing api server" 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 wait ${APISERVER_PID} || true
kube::log::status "api server exited" kube::log::status "api server exited"
fi
unset APISERVER_PID unset APISERVER_PID
} }