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 948c4203c0ddaef5ce2270c34ec306716696f8a6 Merge: 6cdf0fc38b 26101d7e90 Author: Stefan Miklosovic <[email protected]> AuthorDate: Fri Aug 7 13:35:43 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + pylib/cqlshlib/cqlshmain.py | 19 +++++++++ pylib/cqlshlib/test/test_cqlsh_output.py | 66 ++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --cc CHANGES.txt index ef37224d5f,a1f160a97c..07516c9f20 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,12 +1,14 @@@ -6.0-alpha3 +7.0 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366) + * Don't increment client metrics on messaging service connection unpause (CASSANDRA-21491) + * Add nodetool getreplicas (CASSANDRA-17665) + * Implementation of CEP-49: Hardware-accelerated compression (CASSANDRA-20975) + * 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: + * Make cqlsh prompt to reset to no keyspace set by USE after dropping that keyspace (CASSANDRA-21548) * Implement CMS rediscovery and recovery protocol (CASSANDRA-20476) -Merged from 5.0: - * Fix ThreadLocalReadAheadBuffer#fill() to throw a CorruptBlockException if chunk metadata and file size are out of sync (CASSANDRA-21519) - * Fix memtable on-heap accounting drift in BTree.update and BTreeRow.merge (CASSANDRA-21472) - - -6.0-alpha2 * Apply performance optimizations for rows merging logic (CASSANDRA-21524) * Fix operationMode reporting DECOMMISSION_FAILED instead of LEAVING when resuming a failed decommission (CASSANDRA-21493) * Avoid megamorphic calls when serializing and deserializing fixed-length values (CASSANDRA-21536) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
