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 8f759e01d50bdf670a66bc77c3d5651c161939b9
Merge: 1a46e96890 a92de92b8c
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Dec 8 08:56:37 2023 -0600

    Merge branch 'cassandra-5.0' into trunk

 .build/dependency-check-suppressions.xml | 2 ++
 CHANGES.txt                              | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --cc CHANGES.txt
index 60879f9d64,4b5d36b708..617a414473
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,12 +1,19 @@@
 -5.0-beta2
 +5.1
 + * Make nodetool tablestats use number of significant digits for time and 
average values consistently (CASSANDRA-19015)
 + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
 + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
 + * Add ELAPSED command to cqlsh (CASSANDRA-18861)
 + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
 + * Clean up obsolete functions and simplify cql_version handling in cqlsh 
(CASSANDRA-18787)
 +Merged from 5.0:
+  * Suppress CVE-2023-6481 (CASSANDRA-19184)
+ Merged from 4.1:
+  * Fix StackOverflowError on ALTER after many previous schema changes 
(CASSANDRA-19166)
+ Merged from 4.0:
+ Merged from 3.11:
+ Merged from 3.0:
+ 
+ 5.0-beta1
   * Fix SAI intersection queries (CASSANDRA-19011)
   * Clone EndpointState before sending GossipShutdown message (CASSANDRA-19115)
   * SAI indexes are marked queryable during truncation (CASSANDRA-19032)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to