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 461987627b59b34e3443469132fefaea487ecf1e
Merge: 2b2732450c 6fa548f9e9
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Jul 10 10:05:21 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/EndpointState.java | 5 -----
src/java/org/apache/cassandra/gms/Gossiper.java | 17 -----------------
.../cassandra/locator/ReconnectableSnitchHelper.java | 8 ++------
src/java/org/apache/cassandra/net/MessagingService.java | 7 -------
.../cassandra/net/OutboundConnectionSettings.java | 4 ++--
6 files changed, 5 insertions(+), 37 deletions(-)
diff --cc CHANGES.txt
index ca43e3f2ff,c151e9dc78..eaf53682b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-4.0.11
+4.1.3
+ * Add a virtual table that exposes currently running queries
(CASSANDRA-15241)
+Merged from 4.0:
+ * Revert CASSANDRA-16718 (CASSANDRA-18560)
* Upgrade snappy to 1.1.10.1 (CASSANDRA-18608)
* Fix assertion error when describing mv as table (CASSANDRA-18596)
* Track the amount of read data per row (CASSANDRA-18513)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
