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 1b37872410e5be4453b7e4e1d7deed1096799779 Merge: 4ea936b2c7 d1212e8017 Author: Maxim Muzafarov <[email protected]> AuthorDate: Fri Jun 19 22:25:31 2026 +0200 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Rename conflicting nodetool import --copy-data short option from -p to -cd CHANGES.txt | 1 + test/unit/org/apache/cassandra/db/ImportTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index eb9d884f88,4dbb5c2691..3d60231178 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -44,20 -39,6 +44,21 @@@ 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: + * 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]
