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 c59ae412174e89ecdcb3505dcdfddd8c09559833 Merge: 9c3caa8c95 bbff4f8d18 Author: Stefan Miklosovic <[email protected]> AuthorDate: Sun May 31 11:26:58 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 4 +++- .../cassandra/db/virtual/TableMetricTables.java | 1 + .../apache/cassandra/metrics/KeyspaceMetrics.java | 3 +++ .../org/apache/cassandra/metrics/TableMetrics.java | 3 +++ .../distributed/test/metric/TableMetricTest.java | 2 +- .../apache/cassandra/metrics/TableMetricsTest.java | 26 ++++++++++++++++++++++ 7 files changed, 38 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index d36a94b908,b575217259..b4921b922a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -6.0-alpha2 +7.0 + * 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: + * Add rowsMutatedPerWriteHistogram metric to track rows mutated per write request (CASSANDRA-21320) * Add TotalRowsRead and TotalRowsMutated counters to TableMetrics for accurate per-table row throughput tracking (CASSANDRA-21321) * Move exception handling of SPI startup checks when iterating over them (CASSANDRA-21409) * Avoid type lookup in SerializationHeader#getType if schema and SSTable are aligned (CASSANDRA-21402) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
