merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947753 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-05-24 18:27:52 +00:00
parent 4ed5281bf5
commit a46b3bf548
2 changed files with 4 additions and 5 deletions

View File

@ -51,6 +51,7 @@ dev
* windows scripts for SSTableImport/Export (CASSANDRA-1051)
* windows script for nodetool (CASSANDRA-1113)
* make repair of RF==1 a no-op (CASSANDRA-1090)
* improve default JVM GC options (CASSANDRA-1014)
0.6.1

View File

@ -39,16 +39,14 @@ done
# Arguments to pass to the JVM
JVM_OPTS=" \
-ea \
-Xms128M \
-Xms256M \
-Xmx1G \
-XX:TargetSurvivorRatio=90 \
-XX:+AggressiveOpts \
-XX:+UseParNewGC \
-XX:+UseConcMarkSweepGC \
-XX:+CMSParallelRemarkEnabled \
-XX:SurvivorRatio=8 \
-XX:MaxTenuringThreshold=1 \
-XX:+HeapDumpOnOutOfMemoryError \
-XX:SurvivorRatio=128 \
-XX:MaxTenuringThreshold=0 \
-Dcom.sun.management.jmxremote.port=8080 \
-Dcom.sun.management.jmxremote.ssl=false \
-Dcom.sun.management.jmxremote.authenticate=false"