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:56:57 UTC
svn commit: r1493375 - in /zookeeper/bookkeeper/branches/branch-4.2:
CHANGES.txt bookkeeper-server/bin/bookkeeper
Author: fpj
Date: Sat Jun 15 14:56:57 2013
New Revision: 1493375
URL: http://svn.apache.org/r1493375
Log:
BOOKKEEPER-626: BOOKIE_EXTRA_OPTS are added twice (vinay via fpj)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/bin/bookkeeper
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1493375&r1=1493374&r2=1493375&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Sat Jun 15 14:56:57 2013
@@ -24,6 +24,8 @@ Release 4.2.2 - Unreleased
BOOKKEEPER-577: BookieFailureTest uses sync/wait()/notify() incorrectly (ivank)
+ BOOKKEEPER-626: BOOKIE_EXTRA_OPTS are added twice (vinay via fpj)
+
hedwig-server:
BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/bin/bookkeeper
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/bin/bookkeeper?rev=1493375&r1=1493374&r2=1493375&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/bin/bookkeeper (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/bin/bookkeeper Sat Jun 15 14:56:57 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"