Author: phunt
Date: Mon Apr 12 06:31:47 2010
New Revision: 933112
URL: http://svn.apache.org/viewvc?rev=933112&view=rev
Log:
ZOOKEEPER-722. zkServer.sh uses sh's builtin echo on BSD, behaves incorrectly.
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/bin/zkServer.sh
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=933112&r1=933111&r2=933112&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Mon Apr 12 06:31:47 2010
@@ -15,6 +15,9 @@ BUGFIXES:
zookeeper-{version}-src.jar to publish sources in the Maven repository
(paolo via phunt)
+ ZOOKEEPER-722. zkServer.sh uses sh's builtin echo on BSD, behaves
+ incorrectly. (Ivan Kelly via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-724. Improve junit test integration - log harness information
(phunt via mahadev)
Modified: hadoop/zookeeper/trunk/bin/zkServer.sh
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkServer.sh?rev=933112&r1=933111&r2=933112&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/bin/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/bin/zkServer.sh Mon Apr 12 06:31:47 2010
@@ -77,7 +77,7 @@ start)
echo "Starting zookeeper ... "
java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}"
"-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" &
- echo -n $! > "$ZOOPIDFILE"
+ /bin/echo -n $! > "$ZOOPIDFILE"
echo STARTED
;;
stop)
