This is an automated email from the ASF dual-hosted git repository.

jchovatia pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4a2bf29a34cea273c5d23e0b9cd3c19ef0954853
Author: Jaydeepkumar Chovatia <[email protected]>
AuthorDate: Sun Jan 18 21:12:35 2026 -0800

    ninja: ant check after CASSANDRA-17401 landed
---
 CHANGES.txt                                                         | 3 +--
 .../cql3/validation/miscellaneous/PreparedStatementTest.java        | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 069197afa5..99eb2871a9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,7 @@
- * No need to evict already prepared statements, as it creates a race 
condition between multiple threads (CASSANDRA-17401)
 5.0.7
+ * No need to evict already prepared statements, as it creates a race 
condition between multiple threads (CASSANDRA-17401)
  * Upgrade logback version to 1.5.18 and slf4j dependencies to 2.0.17 
(CASSANDRA-21137)
  * Automatically disable zero-copy streaming for legacy sstables with old 
bloom filter format (CASSANDRA-21092)
->>>>>>> a06df099f4 (No need to evict already prepared statements, as it 
creates a race condition between multiple threads)
  * Fix CQLSSTableWriter serialization of vector of date and time 
(CASSANDRA-20979)
  * Correctly calculate default for FailureDetector max interval 
(CASSANDRA-21025)
  * Adding missing configs in system_views.settings to be backward compatible 
(CASSANDRA-20863)
diff --git 
a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/PreparedStatementTest.java
 
b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/PreparedStatementTest.java
index a0bebed43c..8b6185389b 100644
--- 
a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/PreparedStatementTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/PreparedStatementTest.java
@@ -17,6 +17,9 @@
  */
 package org.apache.cassandra.cql3.validation.miscellaneous;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -25,9 +28,6 @@ import org.apache.cassandra.cql3.QueryProcessor;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.transport.messages.ResultMessage;
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class PreparedStatementTest extends CQLTester
 {
     private static final int NUM_THREADS = 50;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to