This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit df94834b1948727f282e8867a474ff4b51b5d9db
Merge: b966f6af11 a503ae4013
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Sep 5 15:46:33 2023 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
debian/cassandra.install | 2 ++
2 files changed, 3 insertions(+)
diff --cc CHANGES.txt
index ade047d007,d6659399ac..7294d99c8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,22 -19,6 +14,23 @@@ 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:
++ * Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
+ * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
+ * 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
