natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 1.0

This commit is contained in:
Jonathan Ellis 2012-09-04 14:54:30 -05:00
parent e1b10590e8 08c654601f
commit f94c839dcf
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -6,6 +6,7 @@
* Change nodetool setcachecapcity to manipulate global caches (CASSANDRA-4563) * Change nodetool setcachecapcity to manipulate global caches (CASSANDRA-4563)
* (cql3) fix setting compaction strategy (CASSANDRA-4597) * (cql3) fix setting compaction strategy (CASSANDRA-4597)
Merged from 1.0: Merged from 1.0:
* increase Xss to 160k to accomodate latest 1.6 JVMs (CASSANDRA-4602)
* fix toString of hint destination tokens (CASSANDRA-4568) * fix toString of hint destination tokens (CASSANDRA-4568)

2
conf/cassandra-env.sh
View File

@ -188,7 +188,7 @@ if [ "`uname`" = "Linux" ] ; then
then then
JVM_OPTS="$JVM_OPTS -Xss180k" JVM_OPTS="$JVM_OPTS -Xss180k"
else else
JVM_OPTS="$JVM_OPTS -Xss128k" JVM_OPTS="$JVM_OPTS -Xss160k"
fi fi
fi fi
echo "xss = $JVM_OPTS" echo "xss = $JVM_OPTS"