This is an automated email from the ASF dual-hosted git repository. iamaleksey pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 629638b4db19fd72fa2bf6e3ca5616cc0cab4911 Merge: 308adc4f82 f67f4ead45 Author: Aleksey Yeshchenko <[email protected]> AuthorDate: Mon Jun 15 11:24:16 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/cache/SerializingCacheProvider.java | 2 +- src/java/org/apache/cassandra/dht/AbstractBounds.java | 6 +++--- src/java/org/apache/cassandra/exceptions/RequestFailureReason.java | 5 ++++- src/java/org/apache/cassandra/gms/GossipDigestAck.java | 5 ++++- src/java/org/apache/cassandra/gms/GossipDigestSyn.java | 4 ++-- src/java/org/apache/cassandra/net/CustomParamsSerializer.java | 2 +- src/java/org/apache/cassandra/repair/RepairJobDesc.java | 2 +- .../org/apache/cassandra/schema/SchemaMutationsSerializer.java | 5 ++++- src/java/org/apache/cassandra/streaming/StreamRequest.java | 7 +++++-- src/java/org/apache/cassandra/utils/BloomFilterSerializer.java | 2 +- src/java/org/apache/cassandra/utils/EstimatedHistogram.java | 2 +- 12 files changed, 28 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index acd40e2b3e,cf7a3f4f53..950ed48917 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -39,16 -35,6 +39,17 @@@ 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: + * 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]
