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 c2a4caa7301928fa2338b9c77437d41fa7c347fa Merge: 3ebd09262b ba255f4fc7 Author: Stefan Miklosovic <smikloso...@apache.org> AuthorDate: Mon Sep 18 21:23:18 2023 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cache/AutoSavingCache.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index ba24ef078e,0f9d089477..f9fdb07388 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,6 +1,8 @@@ -5.0-alpha2 +5.1 + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Do not log stacktrace on mismatched cache and schema version and checksum error in AutoSavingCache (CASSANDRA-18862) + * Remove wrong assertion in SSTableLoader (CASSANDRA-18840) * Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 (CASSANDRA-18848) * Remove metrics-reporter-config dependency (CASSANDRA-18743) * Fix SAI's SegmentMetadata min and max primary keys (CASSANDRA-18734) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org