This is an automated email from the ASF dual-hosted git repository.
paulo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 158875858c67a1518c70ce115530bc492df65ce2
Merge: 035705f494 da2dd2bfbc
Author: Paulo Motta <pa...@apache.org>
AuthorDate: Mon Jan 23 17:29:19 2023 -0500
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 2 +-
.../cassandra/db/compaction/CompactionManager.java | 6 +-
.../apache/cassandra/service/StorageService.java | 4 +
.../cassandra/distributed/action/GossipHelper.java | 12 +++
.../distributed/test/ring/CleanupFailureTest.java | 111 +++++++++++++++++++++
test/unit/org/apache/cassandra/db/CleanupTest.java | 6 +-
6 files changed, 133 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index a1df8fea13,fc8eac05dc..188d1ef5e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -157,14 -84,6 +158,13 @@@ Merged from 3.0
* 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 sstable loading of keyspaces named snapshots or backups
(CASSANDRA-14013)
+ * Restore internode custom tracing on 4.0's new messaging system
(CASSANDRA-17981)
+ * Harden parsing of boolean values in CQL in PropertyDefinitions
(CASSANDRA-17878)
+ * 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
