You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@zookeeper.apache.org by mi...@apache.org on 2014/11/17 07:48:15 UTC

svn commit: r1640070 - in /zookeeper/branches/branch-3.5: CHANGES.txt bin/zkServer.sh

Author: michim
Date: Mon Nov 17 06:48:15 2014
New Revision: 1640070

URL: http://svn.apache.org/r1640070
Log:
ZOOKEEPER-2079 Stop daemon with "kill" rather than "kill -9" (Guillaume ALAUX via michim)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/bin/zkServer.sh

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1640070&r1=1640069&r2=1640070&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Mon Nov 17 06:48:15 2014
@@ -23,6 +23,9 @@ IMPROVEMENTS:
 
   ZOOKEEPER-1948 Enable JMX remote monitoring (Biju Nair via rakeshr)
 
+  ZOOKEEPER-2079 Stop daemon with "kill" rather than "kill -9" (Guillaume ALAUX
+  via michim)
+
 Release 3.5.0 - 8/4/2014
 
 NEW FEATURES:

Modified: zookeeper/branches/branch-3.5/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/bin/zkServer.sh?rev=1640070&r1=1640069&r2=1640070&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/bin/zkServer.sh (original)
+++ zookeeper/branches/branch-3.5/bin/zkServer.sh Mon Nov 17 06:48:15 2014
@@ -180,7 +180,7 @@ stop)
     then
       echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
     else
-      $KILL -9 $(cat "$ZOOPIDFILE")
+      $KILL $(cat "$ZOOPIDFILE")
       rm "$ZOOPIDFILE"
       echo STOPPED
     fi