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 d4e41592592304e4f2a36b58bd8b79b7576c852a
Merge: 6a2d3702ef 67d73469b4
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue May 16 09:01:48 2023 -0500
Merge branch 'cassandra-4.1' into trunk
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, 38 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 4937943c78,77b725fa3c..e4263c80a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -144,7 -6,9 +144,8 @@@
* Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
Merged from 4.0:
+ * Allow internal address to change with reconnecting snitches
(CASSANDRA-16718)
* Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918)
- * NPE when deserializing malformed collections from client (CASSANDRA-18505)
* Improve 'Not enough space for compaction' logging messages
(CASSANDRA-18260)
* Incremental repairs fail on mixed IPv4/v6 addresses serializing
SyncRequest (CASSANDRA-18474)
* Deadlock updating sstable metadata if disk boundaries need reloading
(CASSANDRA-18443)
diff --cc src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
index 6a2543f783,5b246e3c5a..4721e61ce9
--- a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
+++ b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
@@@ -23,11 -23,11 +23,11 @@@ import com.google.common.base.Precondit
import io.netty.channel.WriteBufferWaterMark;
import org.apache.cassandra.auth.IInternodeAuthenticator;
+import org.apache.cassandra.config.CassandraRelevantProperties;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.EncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
- import org.apache.cassandra.db.SystemKeyspace;
+ import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.utils.FBUtilities;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
