This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 86dc0c120abf369942a38eeb83e1cbaf1fd6ec77
Merge: 81a2cb782e bd2803307e
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu Mar 14 10:28:02 2024 -0500
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../cassandra/repair/consistent/LocalSessions.java | 36 +++++++++++-----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --cc CHANGES.txt
index af985568cd,4533e86b1c..f7ac26859f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,9 -25,10 +49,10 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * Push LocalSessions info logs to debug (CASSANDRA-18335)
* Filter remote DC replicas out when constructing the initial replica plan
for the local read repair (CASSANDRA-19120)
* Remove redundant code in StorageProxy#sendToHintedReplicas
(CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
