This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 209ba28b4dc5abb32d053d2d9d2605076163d32c
Merge: bede10f36c 0c58fbb8dd
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu Feb 2 11:46:31 2023 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
src/java/org/apache/cassandra/utils/memory/BufferPool.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index aeee3abf4d,ae1135b049..6d7c25f620
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-4.0.8
+4.1.1
+ * PaxosPrepare may add instances to the Electorate that are not in gossip
(CASSANDRA-18194)
+ * Fix PAXOS2_COMMIT_AND_PREPARE_RSP serialisation AssertionError
(CASSANDRA-18164)
+ * Streaming progress virtual table lock contention can trigger
TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
+ * Fix perpetual load of denylist on read in cases where denylist can never
be loaded (CASSANDRA-18116)
+Merged from 4.0:
+ * Add cache type information for maximum memory usage warning message
(CASSANDRA-18184)
* Fix NPE in fqltool dump on null value (CASSANDRA-18113)
* Improve unit tests performance (CASSANDRA-17427)
* Connect to listen address when own broadcast address is requested
(CASSANDRA-18200)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
