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

netudima pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 961f813dacc771d564e8bf39a885b9dc588605ea
Merge: 1b37872410 d46b8a827a
Author: Dmitry Konstantinov <[email protected]>
AuthorDate: Sat Jun 20 15:03:03 2026 +0100

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Report cancelled read command execution to coordinator as a 
RequestFailure.TIMEOUT

 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 3d60231178,36dd204c0f..87ee90e3a7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -6.0-alpha2
 +7.0
 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394)
 + * Allow nodetool garbagecollect to take a user defined list of SSTables 
(CASSANDRA-16767)
 + * Add a guardrail for misprepared statements (CASSANDRA-21139)
 +Merged from 6.0:
+  * Report cancelled read command execution to coordinator as a 
RequestFailure.TIMEOUT (CASSANDRA-21468)
 + * Add policy for selecting CMS host when submitting commit request 
(CASSANDRA-21456)
   * Fix TCM log catchup from peer with snapshots and gaps in the log sequence 
(CASSANDRA-21455)
   * Speed up nodetool doc generation by producing all command help in a single 
jvm (CASSANDRA-21444)
   * Always send TCM commit failures as Messaging failures (CASSANDRA-21457)


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

Reply via email to