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 2c684a0f5a0d3fa8c73daaec9f97eaca0be305f3
Merge: fe025c7f79 78ab095c87
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Sun Sep 15 20:06:18 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
conf/commitlog_archiving.properties | 6 +-
.../apache/cassandra/db/commitlog/CommitLog.java | 12 +-
.../cassandra/db/commitlog/CommitLogArchiver.java | 237 +++++++++++++--------
.../cassandra/db/commitlog/CommitLogMBean.java | 6 +-
.../cassandra/db/commitlog/CommitLogReplayer.java | 22 +-
.../cassandra/db/commitlog/CommitLogSegment.java | 3 +-
.../operations/DropRecreateAndRestoreTest.java | 18 +-
.../apache/cassandra/db/RecoveryManagerTest.java | 94 ++++++--
.../db/commitlog/CommitLogArchiverTest.java | 157 ++++++++++++++
10 files changed, 425 insertions(+), 131 deletions(-)
diff --cc CHANGES.txt
index d1488d59b7,279d06ca93..f8e024181a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -135,14 -76,10 +135,15 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
++ * Fix millisecond and microsecond precision for commit log replay
(CASSANDRA-19448)
+ * Improve accuracy of memtable heap usage tracking (CASSANDRA-17298)
+ * Fix rendering UNSET collection types in query tracing (CASSANDRA-19880)
+ * Fix latency reported by ideal consistency level monitoring
(CASSANDRA-19651)
+ * Use default commitlog settings in test YAMLs (CASSANDRA-19830)
+ * Do not spam log with SSLExceptions (CASSANDRA-18839)
* Fix schema.cql created by a snapshot after dropping more than one column
(CASSANDRA-19747)
* UnsupportedOperationException when reducing scope for LCS compactions
(CASSANDRA-19704)
* Make LWT conditions behavior on frozen and non-frozen columns consistent
for null column values (CASSANDRA-19637)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
