This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7524ed5bfec7fbddb64d1617e81eb90ac368e2de Merge: 2af60dced2 a7bf85c4f3 Author: Brandon Williams <brandonwilli...@apache.org> AuthorDate: Mon Jul 17 11:31:28 2023 -0500 Merge branch 'cassandra-4.0' into cassandra-4.1 build.xml | 3 +++ 1 file changed, 3 insertions(+) diff --cc build.xml index b0bc54f804,f9ee2a782d..d2d5974cd6 --- a/build.xml +++ b/build.xml @@@ -2124,6 -1967,8 +2124,9 @@@ <arg value="${build.test.dir}/jmh-result.json"/> <arg value="-v"/> <arg value="EXTRA"/> - <jvmarg line="${test-jvmargs}"/> + <jvmarg line="${java11-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