Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 cf365e302 -> a9db74b30
Allow LOCAL_JMX to be easily overridden patch by Thorkild Stray ; reviewed by Robert Stupp for CASSANDRA-10275 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad93f3b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad93f3b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad93f3b6 Branch: refs/heads/cassandra-3.0 Commit: ad93f3b6eb2b49f47cb55e09a9edfe42ce9e00e9 Parents: 484e645 Author: Thorkild Stray <thorkild-asfj...@stray.priv.no> Authored: Fri Oct 9 13:06:33 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Oct 9 13:06:33 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad93f3b6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a9b11ae..7aa5eac 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.11 + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad93f3b6/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 73217bb..eccea48 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -276,7 +276,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"
