This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1ac31a64a9d02372f59938592aff283ed7c0b438 Merge: 15f355a006 b8209a06fb Author: Brandon Williams <[email protected]> AuthorDate: Fri Sep 15 12:29:25 2023 -0500 Merge branch 'cassandra-4.1' into cassandra-5.0 CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 46 ++----------------------- 2 files changed, 4 insertions(+), 43 deletions(-) diff --cc CHANGES.txt index 27cb4923dd,2134d0b77b..57e2b39d23 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -206,10 -4,14 +206,11 @@@ Merged from 4.1 * Allow empty keystore_password in encryption_options (CASSANDRA-18778) * Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697) Merged from 4.0: - * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) - * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) - * Migrate Python optparse to argparse (CASSANDRA-17914) + * Partial compaction can resurrect deleted data (CASSANDRA-18507) Merged from 3.11: + * Revert CASSANDRA-18543 (CASSANDRA-18854) * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) Merged from 3.0: - * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803) * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585) * CQLSH emits a warning when the server version doesn't match (CASSANDRA-18745) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
