Merge branch 'cassandra-2.1' into trunk

2014-10-01 12:35:54 -05:00 · 2014-10-01 12:35:54 -05:00 · 67de6d30f3
parent ada8d8b60b 629c9a5957
commit 67de6d30f3
2 changed files with 2 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -80,6 +80,7 @@
 * Make repair -pr work with -local (CASSANDRA-7450)
 * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
 Merged from 2.0:
+ * Increase nodetool Xmx (CASSANDRA-7956)
 * Archive any commitlog segments present at startup (CASSANDRA-6904)
 * CrcCheckChance should adjust based on live CFMetadata not 
   sstable metadata (CASSANDRA-7978)
--- a/bin/nodetool
+++ b/bin/nodetool
@ -87,7 +87,7 @@ case "`uname`" in
 esac

 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" \
-      -Xmx32m \
+      -Xmx128m \
      -Dcassandra.storagedir="$cassandra_storagedir" \
      -Dlogback.configurationFile=logback-tools.xml \
      -Dstorage-config="$CASSANDRA_CONF" \