Updated Branches: refs/heads/cassandra-1.2 b5f172624 -> 09ee5db73 refs/heads/trunk ba3430cb9 -> ff86f3f9a
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff86f3f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff86f3f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff86f3f9 Branch: refs/heads/trunk Commit: ff86f3f9a7db5cfbbd37ae096316fcb3bb94efba Parents: ba3430c 09ee5db Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Mar 11 17:19:45 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Mar 11 17:19:45 2013 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff86f3f9/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --cc conf/cassandra-env.sh index 4cda06a,f98bdb8..b532c32 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -216,12 -216,13 +216,18 @@@ f # JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" # JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" # JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" + # If you are using JDK 6u34 7u2 or later you can enable GC log rotation + # don't stick the date in the log name if rotation is on. + # JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" + # JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" + # JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" + # JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" +# Configure the following for JEMallocAllocator and if jemalloc is not available in the system +# library path (Example: /usr/local/lib/). Usually "make install" will do the right thing. +# export LD_LIBRARY_PATH=<JEMALLOC_HOME>/lib/ +# JVM_OPTS="-Djava.library.path=<JEMALLOC_HOME>/lib/" + # uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 # JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414"
