This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d62d845c7d86b6ca5ea4d63042123d1b3802ae5e
Merge: 472dc30faa 9524c22990
Author: Ariel Weisberg <aweisb...@apple.com>
AuthorDate: Thu Oct 6 14:11:50 2022 -0400
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageService.java | 27 +++++++++++++++++++---
.../service/StorageServiceServerTest.java | 22 ++++++++++++++++++
3 files changed, 47 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 3c4c1785d2,6a04c99148..c418c48ba9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -88,6 -37,6 +88,7 @@@ 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 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
