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 2df88755022f09ecef86b2173a0282e1586cd7b2
Merge: 825ff89c70 51018940f6
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Aug 23 15:44:46 2023 +0200

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                            |  1 +
 .../cql3/statements/schema/AlterTypeStatement.java     |  6 ++++++
 .../cql3/validation/entities/UserTypesTest.java        | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --cc CHANGES.txt
index d6dd359d98,262a2edcb6..cfc0a9aace
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,18 -14,6 +8,19 @@@ Merged from 5.0
   * 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)
 +Merged from 4.1:
 +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:
++ * 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
   * 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to