This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 03c9bd316349b0cea930d688af3955507d12f2b3
Merge: 6a42c21 4801fef
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Thu Apr 30 19:36:25 2020 +0200
Merge branch 'cassandra-3.11' into trunk
build.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --cc build.xml
index 318947a,060aa1d..3cc4f1b
--- a/build.xml
+++ b/build.xml
@@@ -1398,8 -1270,9 +1398,9 @@@
<jvmarg value="-Dstorage-config=${test.conf}"/>
<jvmarg value="-Djava.awt.headless=true"/>
<!-- Cassandra 3.0+ needs <jvmarg line="... ${additionalagent}" />
here! (not value=) -->
- <jvmarg line="-javaagent:${basedir}/lib/jamm-0.3.0.jar
${additionalagent}" />
+ <jvmarg line="-javaagent:${basedir}/lib/jamm-${jamm.version}.jar
${additionalagent}" />
<jvmarg value="-ea"/>
+ <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
<jvmarg value="-Dcassandra.debugrefcount=true"/>
<jvmarg value="-Xss256k"/>
<!-- When we do classloader manipulation SoftReferences can cause
memory leaks
@@@ -1467,9 -1329,9 +1468,8 @@@
<testmacro inputdir="${test.unit.src}" timeout="${test.timeout}">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg
value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
- <jvmarg
value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
- <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
<jvmarg value="-Dcassandra.skip_sync=true" />
</testmacro>
<fileset dir="${test.unit.src}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
