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 dc45b34046cae7337980b8600bf122e7b31e83cf
Merge: 02c17e9960 52a513f724
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Jul 10 10:52:05 2024 +0200

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                        |  1 +
 .../org/apache/cassandra/schema/TableMetadata.java |  2 +-
 .../apache/cassandra/db/SchemaCQLHelperTest.java   | 86 ++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 02f7a56e41,4468b6b8ca..91d3d51abc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -104,12 -51,15 +104,13 @@@ Merged from 4.1
   * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
   * Do not go to disk for reading hints file sizes (CASSANDRA-19477)
   * Fix system_views.settings to handle array types (CASSANDRA-19475)
 - * Memoize Cassandra verion and add a backoff interval for failed schema 
pulls (CASSANDRA-18902)
   * Fix StackOverflowError on ALTER after many previous schema changes 
(CASSANDRA-19166)
 + * Memoize Cassandra verion (CASSANDRA-18902)
  Merged from 4.0:
+  * Fix schema.cql created by a snapshot after dropping more than one column 
(CASSANDRA-19747)
   * UnsupportedOperationException when reducing scope for LCS compactions 
(CASSANDRA-19704)
   * Make LWT conditions behavior on frozen and non-frozen columns consistent 
for null column values (CASSANDRA-19637)
 - * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439)
 - * Bring Redhat packge dirs/ownership/perms in line with Debian package 
(CASSANDRA-19565)
 + * Bring Redhat package dirs/ownership/perms in line with Debian package 
(CASSANDRA-19565)
   * Make nodetool import congruent with the documentation by not relying on 
the folder structure of the imported SSTable files (CASSANDRA-19401)
   * IR may leak SSTables with pending repair when coming from streaming 
(CASSANDRA-19182)
   * Streaming exception race creates corrupt transaction log files that 
prevent restart (CASSANDRA-18736)


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

Reply via email to