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 b04c2aeddce22b667f523d5e1988f6f1892710a9
Merge: 269c04474f 046c8447ec
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Mon Aug 28 09:46:33 2023 -0400

    Merge branch 'cassandra-5.0' into trunk

 .build/parent-pom-template.xml | 2 +-
 CHANGES.txt                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 2c043d558f,6ac699d84a..9fd9c63069
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,14 +1,7 @@@
 -5.0-alpha2
 +5.1
 +Merged from 5.0:
+  * Update commons-lang3 to 3.13.0 (CASSANDRA-18789)
   * Forbid SAI indexes with analysis options on primary key columns 
(CASSANDRA-18782)
 -Merged from 4.1:
 - * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
 -Merged from 4.0:
 -Merged from 3.11:
 -Merged from 3.0:
 - * Make alternation of a user type validate the same way as creation of a 
user type does (CASSANDRA-18585)
 -
 -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)


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

Reply via email to