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 310d790ce4734727f943225eb951ab0d889c0a5b
Merge: 2108f9dcaf 00dccf25ab
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu Apr 4 11:00:48 2024 -0500
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/transport/ServerConnection.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index f42a740790,7fcb87292f..4be9b7d42d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -62,9 -33,10 +62,10 @@@ Merged from 5.0
Merged from 4.1:
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * 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:
+ * Change logging to TRACE when failing to get peer certificate
(CASSANDRA-19508)
* 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
