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 CED79D6A5 for ; Fri, 21 Sep 2012 23:05:08 +0000 (UTC) Received: (qmail 29176 invoked by uid 500); 21 Sep 2012 23:05:08 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 29150 invoked by uid 500); 21 Sep 2012 23:05:08 -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 29142 invoked by uid 99); 21 Sep 2012 23:05:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Sep 2012 23:05:08 +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; Fri, 21 Sep 2012 23:05:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7CD0C2388A4A for ; Fri, 21 Sep 2012 23:04:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1388719 - in /zookeeper/branches/branch-3.3: CHANGES.txt bin/zkServer.sh Date: Fri, 21 Sep 2012 23:04:24 -0000 To: commits@zookeeper.apache.org From: henry@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120921230424.7CD0C2388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: henry Date: Fri Sep 21 23:04:23 2012 New Revision: 1388719 URL: http://svn.apache.org/viewvc?rev=1388719&view=rev Log: ZOOKEEPER-1376. zkServer.sh does not correctly check for $SERVER_JVMFLAGS (Skye W-M via henryr) Modified: zookeeper/branches/branch-3.3/CHANGES.txt zookeeper/branches/branch-3.3/bin/zkServer.sh Modified: zookeeper/branches/branch-3.3/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1388719&r1=1388718&r2=1388719&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/CHANGES.txt (original) +++ zookeeper/branches/branch-3.3/CHANGES.txt Fri Sep 21 23:04:23 2012 @@ -1,3 +1,9 @@ +Release 3.3.7 - TBD +Backward compatible changes: + + ZOOKEEPER-1376. zkServer.sh does not correctly check for + $SERVER_JVMFLAGS (Skye W-M via henryr) + Release 3.3.6 - 2012-08-01 Backward compatible changes: Modified: zookeeper/branches/branch-3.3/bin/zkServer.sh URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/bin/zkServer.sh?rev=1388719&r1=1388718&r2=1388719&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/bin/zkServer.sh (original) +++ zookeeper/branches/branch-3.3/bin/zkServer.sh Fri Sep 21 23:04:23 2012 @@ -53,7 +53,7 @@ ZOOBINDIR=`dirname "$ZOOBIN"` . "$ZOOBINDIR"/zkEnv.sh -if [ "x$SERVER_JVMFLAGS" ] +if [ "x$SERVER_JVMFLAGS" != "x" ] then JVMFLAGS="$SERVER_JVMFLAGS $JVMFLAGS" fi