You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2013/06/15 16:53:44 UTC

svn commit: r1493373 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/bin/bookkeeper

Author: fpj
Date: Sat Jun 15 14:53:44 2013
New Revision: 1493373

URL: http://svn.apache.org/r1493373
Log:
BOOKKEEPER-626: BOOKIE_EXTRA_OPTS are added twice (vinay via fpj)


Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1493373&r1=1493372&r2=1493373&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Jun 15 14:53:44 2013
@@ -51,6 +51,8 @@ Trunk (unreleased changes)
         BOOKKEEPER-599: NPE in PerChannelBookieClient (jiannan via sijie)
 
 	BOOKKEEPER-577: BookieFailureTest uses sync/wait()/notify() incorrectly (ivank via fpj) 
+	
+	BOOKKEEPER-626: BOOKIE_EXTRA_OPTS are added twice (vinay via fpj)
 
       hedwig-client:
 

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper?rev=1493373&r1=1493372&r2=1493373&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper Sat Jun 15 14:53:44 2013
@@ -148,7 +148,7 @@ BOOKIE_CLASSPATH="$BOOKIE_JAR:$BOOKIE_CL
 BOOKIE_CLASSPATH="`dirname $BOOKIE_LOG_CONF`:$BOOKIE_CLASSPATH"
 OPTS="$OPTS -Dlog4j.configuration=`basename $BOOKIE_LOG_CONF`"
 
-OPTS="-cp $BOOKIE_CLASSPATH $OPTS $BOOKIE_EXTRA_OPTS"
+OPTS="-cp $BOOKIE_CLASSPATH $OPTS"
 
 OPTS="$OPTS $BOOKIE_EXTRA_OPTS"