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 5b36e263adf2149f960a20aaa2a1447ef05817b9 Merge: 31b4958365 1913eab974 Author: Stefan Miklosovic <[email protected]> AuthorDate: Wed Aug 12 16:07:57 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../cql3/functions/masking/ColumnMask.java | 7 +- .../test/ColumnMaskMetadataSnapshotTest.java | 156 +++++++++++++++++++++ .../schema/SchemaMetadataSerializationTest.java | 114 +++++++++++++++ 4 files changed, 274 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 11e6997cd3,b8368c1170..6e9d6790b5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -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: + * Fix deserialization of column masks in cluster metadata (CASSANDRA-21549) * Caffeine caches in CompressionDictionaryCache and ZstdDictionaryCompressor should specify an executor explicitly (CASSANDRA-21557) * 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) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
