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

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

commit 8077f276c2e191ef28119ffbfad3a3ac0dab9f48
Merge: 3e2e4c3ea1 78290bed45
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Tue Apr 15 22:51:27 2025 -0500

    Merge branch 'cassandra-4.0' into cassandra-4.1
    
    * cassandra-4.0:
      Avoid computing prepared statement size for unprepared batches

 CHANGES.txt                                                      | 1 +
 src/java/org/apache/cassandra/cql3/QueryProcessor.java           | 9 ++++++++-
 .../org/apache/cassandra/transport/messages/BatchMessage.java    | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 7bfbf22b74,67672cd0c5..ff191d6d9b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -4.0.18
 +4.1.9
 + * Fix mixed mode paxos ttl commit hang (CASSANDRA-20514)
 + * Fix paxos mixed mode infinite loop (CASSANDRA-20493)
 + * Optionally skip exception logging on invalid legacy protocol magic 
exception (CASSANDRA-19483)
 + * Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)
 + * Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking 
thread is interrupted (CASSANDRA-20084)
 +Merged from 4.0:
+  * Avoid computing prepared statement size for unprepared batches 
(CASSANDRA-20556)
   * Fix Dropwizard Meter causes timeouts when infrequently used 
(CASSANDRA-19332)
   * Update OWASP dependency checker to version 12.1.0 (CASSANDRA-20501)
   * Suppress CVE-2025-25193 (CASSANDRA-20504)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to