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 e63d3bfc4bd59205ed93ba23d4411a1294615b35
Merge: 865d7c30e4 4549b07997
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Mon Oct 9 21:44:07 2023 +0200

    Merge branch 'cassandra-5.0' into trunk

 .build/cassandra-deps-template.xml |  4 ----
 .build/parent-pom-template.xml     | 11 -----------
 CHANGES.txt                        |  1 +
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --cc CHANGES.txt
index 57e241c7cf,66f613d26d..03ebe157c0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -5.0-alpha2
 +5.1
 + * 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:
+  * Remove unnecessary reporter-config3 dependency (CASSANDRA-18907)
   * Remove support for empty values on the vector data type (CASSANDRA-18876)
   * Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667)
   * Upgrade caffeine cache and fix CIDR permissions cache invalidation 
(CASSANDRA-18805)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to