This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 04cfb57ddee573eaea00ce8c7e3d99a2f84ca78f
Merge: af9439bcd7 3fc9bc033a
Author: Aleksey Yeschenko <alek...@apache.org>
AuthorDate: Tue Oct 11 15:47:43 2022 +0100
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/utils/memory/BufferPool.java | 200 +++++++++++++++------
.../cassandra/utils/memory/BufferPoolTest.java | 23 +++
3 files changed, 165 insertions(+), 59 deletions(-)
diff --cc CHANGES.txt
index 37ad298e45,c38feb9e16..5b101ab3de
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,7 -38,6 +91,8 @@@ 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 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
