You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/04/30 17:45:41 UTC
[cassandra] branch trunk updated (6a42c21 -> 03c9bd3)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 6a42c21 replace LZ4FastDecompressor with LZ4SafeDecompressor
new b44a214 Make all test targets declare the temp directory (java.io.tmpdir) as defined by tmp.dir
new 0fd9b5b Merge branch 'cassandra-2.2' into cassandra-3.0
new 4801fef Merge branch 'cassandra-3.0' into cassandra-3.11
new 03c9bd3 Merge branch 'cassandra-3.11' into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by mc...@apache.org.
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 <mc...@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org