Unverified Commit 5edfaad6 authored by Holger Levsen's avatar Holger Levsen
Browse files

merge change from jenkins 2.7.4

parent a239d09e
...@@ -134,7 +134,7 @@ do_start() ...@@ -134,7 +134,7 @@ do_start()
# #
get_running() get_running()
{ {
return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java|daemon)' | grep -c . ` return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java)' | grep -v defunct | grep -c . `
} }
force_stop() force_stop()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment