Updated Branches: refs/heads/trunk bef8eef1b -> 6dfb3a855
Fix typo in jvm version comparison. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6dfb3a85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dfb3a85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dfb3a85 Branch: refs/heads/trunk Commit: 6dfb3a8557a39ac22dccbf3c597f558d310fb7e8 Parents: bef8eef Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Aug 1 16:36:04 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Aug 1 16:37:44 2012 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6dfb3a85/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 3370a3c..2928018 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -149,7 +149,7 @@ JMX_PORT="7199" JVM_OPTS="$JVM_OPTS -ea" # add the jamm javaagent -if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" > "1.6.0" ] \ +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.5.jar"