This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 16dc2a23934e687b4c927f2894d609f7bbe04d12
Merge: 70766c7ae9 d4d0abcd03
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Tue Aug 29 10:43:17 2023 -0600
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/streaming/StreamSession.java | 70 ++++++------
.../async/StreamingMultiplexedChannel.java | 8 ++
.../StreamDisconnectedWhileReceivingTest.java | 117 +++++++++++++++++++++
4 files changed, 166 insertions(+), 30 deletions(-)
diff --cc CHANGES.txt
index 9fd9c63069,2c6624abbc..16e2221245
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,20 -18,6 +10,21 @@@ Merged from 5.0
* Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161)
* Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
* Add guardrail for vector dimensions (CASSANDRA-18730)
+Merged from 4.1:
++ * Waiting indefinitely on ReceivedMessage response in
StreamSession#receive() can cause deadlock (CASSANDRA-18733)
+ * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
+Merged from 4.0:
+Merged from 3.11:
+ * Fix NPE when using udfContext in UDF after a restart of a node
(CASSANDRA-18739)
+Merged from 3.0:
+ * Make alternation of a user type validate the same way as creation of a
user type does (CASSANDRA-18585)
+ * Fix missing speculative retries in tablestats (CASSANDRA-18767)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
+
+
+5.0
* Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992)
* Fix for (unsupported) big endian unaligned architecture, eg s390x
(CASSANDRA-17723)
* CIDR filtering authorizer (CASSANDRA-18592)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
