Updated Branches: refs/heads/trunk 811de14ec -> e5ff1075c
Update to jamm-0.2.6 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5ff1075 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5ff1075 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5ff1075 Branch: refs/heads/trunk Commit: e5ff1075c352ea2c1cf8b330b730c111e3f5b5b2 Parents: 811de14 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jan 31 15:46:35 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jan 31 15:46:35 2014 +0100 ---------------------------------------------------------------------- bin/cassandra.bat | 2 +- bin/cassandra.in.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5ff1075/bin/cassandra.bat ---------------------------------------------------------------------- diff --git a/bin/cassandra.bat b/bin/cassandra.bat index e11c0ba..ddbb45e 100644 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@ -30,7 +30,7 @@ if NOT DEFINED JAVA_HOME goto :err REM ***** JAVA options ***** set JAVA_OPTS=-ea^ - -javaagent:"%CASSANDRA_HOME%\lib\jamm-0.2.5.jar"^ + -javaagent:"%CASSANDRA_HOME%\lib\jamm-0.2.6.jar"^ -Xms1G^ -Xmx1G^ -XX:+HeapDumpOnOutOfMemoryError^ http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5ff1075/bin/cassandra.in.sh ---------------------------------------------------------------------- diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh index 29e0d0e..26170ac 100644 --- a/bin/cassandra.in.sh +++ b/bin/cassandra.in.sh @@ -44,5 +44,5 @@ done if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \ || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] then - JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" + JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar" fi \ No newline at end of file
