zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1082221 - in /zookeeper/trunk: CHANGES.txt bin/zkCli.sh bin/zkServer.sh
Date Wed, 16 Mar 2011 17:15:37 GMT
Author: breed
Date: Wed Mar 16 17:15:36 2011
New Revision: 1082221

URL: http://svn.apache.org/viewvc?rev=1082221&view=rev
Log:
ZOOKEEPER-1012. support distinct JVMFLAGS for zookeeper server in zkServer.sh and zookeeper
client in zkCli.sh

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/bin/zkCli.sh
    zookeeper/trunk/bin/zkServer.sh

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1082221&r1=1082220&r2=1082221&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Mar 16 17:15:36 2011
@@ -190,6 +190,8 @@ BUGFIXES: 
 
   ZOOKEEPER-993. Code improvements (MIS via fpj)
 
+  ZOOKEEPER-1012. support distinct JVMFLAGS for zookeeper server in zkServer.sh and zookeeper
client in zkCli.sh (Eugene Koontz via breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

Modified: zookeeper/trunk/bin/zkCli.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCli.sh?rev=1082221&r1=1082220&r2=1082221&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkCli.sh (original)
+++ zookeeper/trunk/bin/zkCli.sh Wed Mar 16 17:15:36 2011
@@ -37,5 +37,5 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 . "$ZOOBINDIR"/zkEnv.sh
 
 $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-     -cp "$CLASSPATH" $JVMFLAGS \
+     -cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS \
      org.apache.zookeeper.ZooKeeperMain $@

Modified: zookeeper/trunk/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.sh?rev=1082221&r1=1082220&r2=1082221&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.sh (original)
+++ zookeeper/trunk/bin/zkServer.sh Wed Mar 16 17:15:36 2011
@@ -53,6 +53,11 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . "$ZOOBINDIR"/zkEnv.sh
 
+if [ "x$SERVER_JVMFLAGS" ]
+then
+    JVMFLAGS="$SERVER_JVMFLAGS $JVMFLAGS"
+fi
+
 if [ "x$2" != "x" ]
 then
     ZOOCFG="$ZOOCFGDIR/$2"



Mime
View raw message