This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a9a09c1e6b2654a432775e27e5b18ce0f61e0355
Merge: 91f5562241 25da086336
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Mon Oct 16 12:24:16 2023 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Test failure:
org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11
.../apache/cassandra/tools/nodetool/ForceCompactionTest.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --cc test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
index 04d369ec6d,ed438b2ca2..878433d702
--- a/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
+++ b/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
@@@ -22,7 -22,8 +22,10 @@@ import java.util.ArrayList
import java.util.Collection;
import java.util.List;
import java.util.Random;
+ import java.util.concurrent.TimeUnit;
+
++import org.apache.cassandra.Util;
+
import org.junit.Before;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
