Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
conf/cassandra-env.sh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c58dd30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c58dd30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c58dd30
Branch: refs/heads/trunk
Commit: 8c58dd30e1a2ab3ee9c6cb010d9b343d9afb3bc8
Parents: 60dbe8b ea0c399
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Wed May 7 16:24:43 2014 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Wed May 7 16:24:43 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c58dd30/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index 200a3b9,fc4fa3d..820f160
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -162,11 -168,7 +168,7 @@@ JMX_PORT="7199
JVM_OPTS="$JVM_OPTS -ea"
# add the jamm javaagent
- if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
- || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
- then
- JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
- fi
-JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
++JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
