This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 07fcac4547acd38f2d34e870ca3ef9434e9edc53 Merge: 32cf1ea33d a580b79d16 Author: Brandon Williams <[email protected]> AuthorDate: Wed Sep 27 13:31:47 2023 -0500 Merge branch 'cassandra-5.0' into trunk .build/parent-pom-template.xml | 6 +++--- CHANGES.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index a4ec2293d5,aa43ff1b18..22ca1d0621 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,12 @@@ -5.0-alpha2 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Upgrade slf4j-api to 1.7.36 (CASSANDRA-18882) * Make the output of ON/OFF commands in cqlsh consistent (CASSANDRA-18547) * Do not create sstable files before registering in txn (CASSANDRA-18737) + * Remove wrong assertion in SSTableLoader (CASSANDRA-18840) * Do not log stacktrace on mismatched cache and schema version and checksum error in AutoSavingCache (CASSANDRA-18862) * Remove wrong assertion in SSTableLoader (CASSANDRA-18840) * Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 (CASSANDRA-18848) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
