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

Posted to commits@zookeeper.apache.org by he...@apache.org on 2012/09/22 01:04:12 UTC

svn commit: r1388718 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkServer.sh

Author: henry
Date: Fri Sep 21 23:04:12 2012
New Revision: 1388718

URL: http://svn.apache.org/viewvc?rev=1388718&view=rev
Log:
ZOOKEEPER-1376. zkServer.sh does not correctly check for $SERVER_JVMFLAGS (Skye W-M via henryr)

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

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1388718&r1=1388717&r2=1388718&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Sep 21 23:04:12 2012
@@ -1,3 +1,12 @@
+Release 3.4.5 - TBD
+
+Backward compatible changes:
+
+BUGFIXES:
+
+  ZOOKEEPER-1376. zkServer.sh does not correctly check for
+  $SERVER_JVMFLAGS (Skye W-M via henryr)
+
 Release 3.4.4 - 2012-09-17 
 
 Backward compatible changes:

Modified: zookeeper/branches/branch-3.4/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkServer.sh?rev=1388718&r1=1388717&r2=1388718&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkServer.sh (original)
+++ zookeeper/branches/branch-3.4/bin/zkServer.sh Fri Sep 21 23:04:12 2012
@@ -53,7 +53,7 @@ else
   . "$ZOOBINDIR"/zkEnv.sh
 fi
 
-if [ "x$SERVER_JVMFLAGS" ]
+if [ "x$SERVER_JVMFLAGS"  != "x" ]
 then
     JVMFLAGS="$SERVER_JVMFLAGS $JVMFLAGS"
 fi