Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0ADA710ACD for ; Mon, 17 Nov 2014 06:48:40 +0000 (UTC) Received: (qmail 49716 invoked by uid 500); 17 Nov 2014 06:48:40 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 49682 invoked by uid 500); 17 Nov 2014 06:48:39 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 49671 invoked by uid 99); 17 Nov 2014 06:48:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2014 06:48:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2014 06:48:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D363723889EC; Mon, 17 Nov 2014 06:48:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1640070 - in /zookeeper/branches/branch-3.5: CHANGES.txt bin/zkServer.sh Date: Mon, 17 Nov 2014 06:48:15 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141117064815.D363723889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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