This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 50ddce8455e43959eb0b10068578e391a2ca5891 Merge: 9783cfeb73 15f139b91e Author: Stefan Miklosovic <[email protected]> AuthorDate: Fri Jul 3 11:11:35 2026 +0200 Merge branch 'cassandra-6.0' into trunk .build/build-resolver.xml | 2 ++ .build/docker/run-tests.sh | 1 + .build/docker/ubuntu-test.docker | 49 +++++++++++++++++++++++++++++++++++++--- .build/run-tests.sh | 2 -- .jenkins/Jenkinsfile | 5 ++-- CHANGES.txt | 1 + bin/cqlsh | 4 ++-- bin/cqlsh.py | 6 ++--- pylib/cassandra-cqlsh-tests.sh | 6 +++++ pylib/requirements.txt | 1 + pylib/setup.py | 2 ++ 11 files changed, 67 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 3fa97b0d1c,1a62d6acf9..3727b164b8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -52,22 -46,6 +52,23 @@@ 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: ++ * Support Python 3.12 and 3.13 in cqlsh (CASSANDRA-20997) + * Make synchronization on VectorMemoryIndex inserts more granular (CASSANDRA-21160) + * Fix RequestFailureReason serializer and nits in a few others (CASSANDRA-21437) + * 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: + * Rename conflicting nodetool import --copy-data short option from -p to -cd (CASSANDRA-20214) + * Fix PasswordObfuscator failing to obfuscate certain passwords (CASSANDRA-21113) + * Fix negative memtable allocator ownership when an update is shadowed by an existing row deletion (CASSANDRA-21469) + * Consider first token of SSTable when calculating SSTable intersection in LeveledScanner (CASSANDRA-21369) + * 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]
