Permalink
Browse files

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
  • Loading branch information...
2 parents d55e191 + fd53628 commit bbad16b7ee78333f75dc27ea3f3558bbec5c326c @driftx driftx committed Feb 28, 2014
Showing with 4 additions and 0 deletions.
  1. +1 −0 CHANGES.txt
  2. +3 −0 conf/cassandra-env.sh
View
@@ -35,6 +35,7 @@ Merged from 2.0:
* Optimize single partition batch statements (CASSANDRA-6737)
* Disallow post-query re-ordering when paging (CASSANDRA-6722)
* Fix potential paging bug with deleted columns (CASSANDRA-6748)
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
@@ -168,6 +168,9 @@ then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
fi
+# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities"

0 comments on commit bbad16b

Please sign in to comment.