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 c5f8e63f67d105f483c56dd4f09b5ee6e46a4241
Merge: 04cfb57dde 15b54687a5
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Oct 11 23:21:25 2022 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/utils/binlog/BinLog.java | 78 ++++++++---
.../cassandra/audit/AuditLoggerCleanupTest.java | 145 +++++++++++++++++++++
3 files changed, 205 insertions(+), 19 deletions(-)
diff --cc CHANGES.txt
index 5b101ab3de,185770bafe..c3f0bcf534
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,8 -39,6 +91,9 @@@ Merged from 4.1
* Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder
class and deprecate it in favor of withBufferSizeInMiB(int size)
(CASSANDRA-17675)
* Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
Merged from 4.0:
++ * Remove empty cq4 files in log directory to not fail the startup of BinLog
(CASSANDRA-17933)
+ * Fix multiple BufferPool bugs (CASSANDRA-16681)
+ * Fix StorageService.getNativeaddress handling of IPv6 addresses
(CASSANDRA-17945)
* Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895)
* Fix repair failure on assertion if two peers have overlapping mismatching
ranges (CASSANDRA-17900)
* Better handle null state in Gossip schema migration to avoid NPE
(CASSANDRA-17864)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
