This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f8d5a1aa162706771000eca18dd9f21282dd2be3
Merge: 7ecac39570 9be8369ae6
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Tue Sep 5 13:58:28 2023 -0400
Merge branch 'cassandra-5.0' into trunk
.build/cassandra-deps-template.xml | 4 ----
.build/parent-pom-template.xml | 5 -----
CHANGES.txt | 1 +
3 files changed, 1 insertion(+), 9 deletions(-)
diff --cc CHANGES.txt
index 7294d99c8a,953ca7f3dc..26dab609c1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,12 +1,7 @@@
-5.0-alpha2
+5.1
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Remove commons-codec dependency (CASSANDRA-18772)
-Merged from 4.1:
-Merged from 4.0:
-Merged from 3.11:
-Merged from 3.0:
- * Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
-
-5.0-alpha1
* Fix rpm installations to work with jdk17 (CASSANDRA-18817)
* Fix Depends and Build-Depends for Java for Debian packages
(CASSANDRA-18809)
* Update command line flags --add-exports and --add-opens for JDK17
(CASSANDRA-18439)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
