Author: jbellis
Date: Wed Apr 27 19:20:17 2011
New Revision: 1097210
URL: http://svn.apache.org/viewvc?rev=1097210&view=rev
Log:
use jamm 0.2.2 to make mvn happy
Added:
cassandra/branches/cassandra-0.8/lib/jamm-0.2.2.jar (with props)
cassandra/branches/cassandra-0.8/lib/licenses/jamm-0.2.2.txt
- copied unchanged from r1096804,
cassandra/branches/cassandra-0.8/lib/licenses/jamm-0.2.1.txt
Removed:
cassandra/branches/cassandra-0.8/lib/jamm-0.2.1.jar
cassandra/branches/cassandra-0.8/lib/licenses/jamm-0.2.1.txt
Modified:
cassandra/branches/cassandra-0.8/build.xml
cassandra/branches/cassandra-0.8/conf/cassandra-env.sh
Modified: cassandra/branches/cassandra-0.8/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1097210&r1=1097209&r2=1097210&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Wed Apr 27 19:20:17 2011
@@ -618,7 +618,7 @@
<jvmarg value="-Dstorage-config=${test.conf}"/>
<jvmarg value="-Daccess.properties=${test.conf}/access.properties"/>
<jvmarg value="-Dlog4j.configuration=log4j-junit.properties" />
- <jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.1.jar" />
+ <jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.2.jar" />
<jvmarg value="-ea"/>
<optjvmargs/>
<classpath>
Modified: cassandra/branches/cassandra-0.8/conf/cassandra-env.sh
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/conf/cassandra-env.sh?rev=1097210&r1=1097209&r2=1097210&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/conf/cassandra-env.sh (original)
+++ cassandra/branches/cassandra-0.8/conf/cassandra-env.sh Wed Apr 27 19:20:17
2011
@@ -95,7 +95,7 @@ JVM_OPTS="$JVM_OPTS -ea"
check_openjdk=$(java -version 2>&1 | awk '{if (NR == 2) {print $1}}')
if [ "$check_openjdk" != "OpenJDK" ]
then
- JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.1.jar"
+ JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.2.jar"
fi
# enable thread priorities, primarily so we can give periodic tasks
Added: cassandra/branches/cassandra-0.8/lib/jamm-0.2.2.jar
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/lib/jamm-0.2.2.jar?rev=1097210&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cassandra/branches/cassandra-0.8/lib/jamm-0.2.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
