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 d45c4cbcbf96afba8d9a2ad4550b8d47db86f648
Merge: 507db24aad 0e21007b4f
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Thu Oct 27 16:07:59 2022 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
.../db/repair/CassandraTableRepairManager.java | 26 +++++++++++++++-------
.../cassandra/service/ActiveRepairService.java | 13 ++++++-----
3 files changed, 26 insertions(+), 14 deletions(-)
diff --cc CHANGES.txt
index a8819b354e,ee48fcfa4b..d3f6df4183
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -101,10 -46,6 +101,11 @@@ 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:
++ * Fix possible race condition on repair snapshots (CASSANDRA-17955)
+ * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
+ * 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
