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 1f1ec5f503f51ee136f6258d6690cac38f0879f1
Merge: 999d263a5d 3d5b5343e0
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Thu Aug 31 10:38:57 2023 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageService.java | 47 +++++++++-------------
2 files changed, 20 insertions(+), 28 deletions(-)
diff --cc CHANGES.txt
index c3ee4678c4,b7880b259a..1ef6464363
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,16 -8,19 +17,17 @@@ Merged from 4.1
* 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:
+ * 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-alpha1
- * Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749)
- * Reduce size of per-SSTable index components for SAI (CASSANDRA-18673)
- * Remove unnecessary Netty dependencies after upgrade to version 4.1.96
(CASSANDRA-18729)
- * Prevent InaccessibleObjectException when the Leak Detector is traversing
objects (CASSANDRA-18708)
- * Remove legacy command line options from cassandra-stress (CASSANDRA-18529)
- * 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)
+
+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
