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 360128b3eb8f1b19dfc887a60d0678bc1f67703f Merge: 06dabb8b3a 9c6e671434 Author: Stefan Miklosovic <[email protected]> AuthorDate: Thu Nov 23 16:20:30 2023 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../compaction/unified/UnifiedCompactionTask.java | 2 +- .../db/compaction/CompactionControllerTest.java | 179 ++++++++++++++++++++- 3 files changed, 179 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 9f4038ff7f,32f4c5efbd..ba31419cf7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-beta1 +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: + * Fixed bug where UnifiedCompactionTask constructor was calling the wrong base constructor of CompactionTask (CASSANDRA-18757) * Fix SAI unindexed contexts not considering CONTAINS KEY (CASSANDRA-19040) * Ensure that empty SAI column indexes do not fail on validation after full-SSTable streaming (CASSANDRA-19017) * SAI in-memory index should check max term size (CASSANDRA-18926) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
