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 fe9f6c1630511890cfe0a8c8311f3141ebde17e0 Merge: aa61536928 3df9dc242c Author: Stefan Miklosovic <[email protected]> AuthorDate: Tue May 5 10:43:34 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 3 +++ src/java/org/apache/cassandra/db/virtual/SettingsTable.java | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 028cd48c9e,e98ef5851c..31d2b92aa1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,3 +1,14 @@@ +7.0 + * 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: + * Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246) + * 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) ++Merged from 5.0: ++ * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348) ++ + 6.0-alpha2 * Avoid unit conversion in DatabaseDescriptor.getMaxValueSize() for every deserializing Cell (CASSANDRA-21295) * Fix single token batch atomicity with Accord/non-Accord batches by using the batch log (CASSANDRA-20588) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
