merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@919470 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 16:27:53 +00:00 · 2010-03-05 16:27:53 +00:00 · 0e6edb5c54
parent 95c484a980
commit 0e6edb5c54
1 changed files with 3 additions and 1 deletions
--- a/bin/cassandra-cli
+++ b/bin/cassandra-cli
@ -43,6 +43,8 @@ if [ -z $CLASSPATH ]; then
    exit 1
 fi

-$JAVA -ea -cp $CLASSPATH  org.apache.cassandra.cli.CliMain "$@"
+$JAVA -ea -cp $CLASSPATH \
+        -Dlog4j.configuration=log4j-tools.properties \
+        org.apache.cassandra.cli.CliMain "$@"

 # vi:ai sw=4 ts=4 tw=0 et