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

Merge branch 'cassandra-2.1' into cassandra-2.2

This commit is contained in:
Robert Stupp 2015-10-09 13:10:01 +02:00
parent 87fa9be46d ad93f3b6eb
commit 82dabe0cf5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -2,6 +2,8 @@
* cqlsh pg-style-strings broken (CASSANDRA-10484)
* Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
Merged from 2.1:
* Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
* Mark nodes as dead even if they've already left (CASSANDRA-10205)
* Update internal python driver used by cqlsh (CASSANDRA-10161)
2.2.2
@ -17,7 +19,6 @@ Merged from 2.1:
* Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)
Merged from 2.1:
* Mark nodes as dead even if they've already left (CASSANDRA-10205)
* Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
* Avoid misleading pushed notifications when multiple nodes
share an rpc_address (CASSANDRA-10052)

4
conf/cassandra-env.sh
View File

@ -326,7 +326,9 @@ JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true"
# To enable remote JMX connections, uncomment lines below
# with authentication and/or ssl enabled. See https://wiki.apache.org/cassandra/JmxSecurity
#
LOCAL_JMX=yes
if [ "x$LOCAL_JMX" = "x" ]; then
LOCAL_JMX=yes
fi
if [ "$LOCAL_JMX" = "yes" ]; then
JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT -XX:+DisableExplicitGC"