[Qa-jenkins-scm] [jenkins.debian.net] 01/01: merge change from jenkins 2.7.4

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 5edfaad69c4cde743ea18d81121e6394a5586dd5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Sep 15 08:38:15 2016 +0200

    merge change from jenkins 2.7.4
---
 hosts/jenkins/etc/init.d/jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/jenkins/etc/init.d/jenkins b/hosts/jenkins/etc/init.d/jenkins
index 4b266c4..51783a8 100755
--- a/hosts/jenkins/etc/init.d/jenkins
+++ b/hosts/jenkins/etc/init.d/jenkins
@@ -134,7 +134,7 @@ do_start()
 # 
 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() 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git