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

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

commit a84647c6c7ea44ebfbe762ad90523256c66eee18
Merge: 45eee68f55 22eb0f9fb7
Author: Maxim Muzafarov <[email protected]>
AuthorDate: Mon Jun 8 21:59:52 2026 +0200

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Remove golang dependency in gen-doc and replace with python implementation

 .build/docker/almalinux-build.docker               |  21 --
 .build/docker/debian-build.docker                  |  17 -
 CHANGES.txt                                        |   1 +
 build.xml                                          |   2 +-
 doc/Makefile                                       |   4 +-
 doc/scripts/cqlprotodoc.py                         | 347 +++++++++++++++++++++
 doc/scripts/gen-native-protocol-docs.sh            |  28 ++
 .../process-native-protocol-specs-in-docker.sh     | 146 ---------
 8 files changed, 379 insertions(+), 187 deletions(-)

diff --cc CHANGES.txt
index d268b7cac7,8e4c39b56f..157af6750a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,15 -27,6 +31,16 @@@ Merged from 6.0
   * Differentiate between legitimate cases where the first entry is the same 
as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() 
(CASSANDRA-21255)
   * Introduce minimum_threshold for data resurrection startup check 
(CASSANDRA-21293)
   * Synchronously publish changes to local gossip state following metadata 
updates (CASSANDRA-21239)
 +Merged from 5.0:
++ * Remove golang dependency in gen-doc and replace with python implementation 
(CASSANDRA-21432)
 + * Use estimated compressed size for tables to check if there is enough free 
space for a compaction (CASSANDRA-21245)
 + * Fix failing select on system_views.settings for non-string keys 
(CASSANDRA-21348)
 +Merged from 4.0:
 + * Remove inFlightEcho entry on ECHO_REQ failure (CASSANDRA-21428)
 + * Validate snapshot names (CASSANDRA-21389)
 +
 +
 +6.0-alpha2
   * Change default for cassandra.set_sep_thread_name to false to reduce CPU 
usage (CASSANDRA-21089)
   * Avoid permission checks for masked columns when the table doesn't have any 
(CASSANDRA-21299)
   * Reduce allocations and array copies due to buffer resizing in 
LocalDataResponse during row serialization (CASSANDRA-21285)


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

Reply via email to