This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d6b305421ad7cbb28ce35f7994f79cefc3937464
Merge: aac070681b 7524ed5bfe
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Jul 17 11:34:29 2023 -0500
Merge branch 'cassandra-4.1' into trunk
build.xml | 3 +++
1 file changed, 3 insertions(+)
diff --cc build.xml
index d69e192ae1,d2d5974cd6..b217781a2e
--- a/build.xml
+++ b/build.xml
@@@ -1845,6 -2124,9 +1845,9 @@@
<arg value="${build.test.dir}/jmh-result.json"/>
<arg value="-v"/>
<arg value="EXTRA"/>
- <jvmarg line="${java11-jvmargs}"/>
++ <jvmarg line="${java-jvmargs}"/>
+ <jvmarg line="${_std-test-jvmargs}"/>
+ <jvmarg line="${test.jvm.args}"/>
<!-- Broken:
ZeroCopyStreamingBench,MutationBench,FastThreadLocalBench (FIXME) -->
<arg value="-e"/><arg
value="ZeroCopyStreamingBench|MutationBench|FastThreadLocalBench"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
