This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2d982a0e52921dcdf8870a998f8346b7f8a140ae Merge: b363568c0f 69f5df0b00 Author: David Capwell <[email protected]> AuthorDate: Mon Oct 30 14:47:27 2023 -0700 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/gms/GossipShutdown.java | 15 +- .../apache/cassandra/metrics/RepairMetrics.java | 71 +++++++ .../cassandra/repair/messages/RepairMessage.java | 79 ++++++-- .../org/apache/cassandra/utils/NoSpamLogger.java | 13 +- .../apache/cassandra/gms/GossipShutdownTest.java | 66 +++++++ .../org/apache/cassandra/repair/FuzzTestBase.java | 24 ++- .../repair/messages/RepairMessageTest.java | 211 +++++++++++++++++++++ .../cassandra/test/asserts/ExtendedAssertions.java | 84 ++++++++ .../apache/cassandra/utils/NoSpamLoggerTest.java | 2 +- 10 files changed, 525 insertions(+), 41 deletions(-) diff --cc CHANGES.txt index cb3fe71211,672d277058..8c1cccac32 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -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: + * Add metrics and logging to repair retries (CASSANDRA-18952) * Remove deprecated code in Cassandra 1.x and 2.x (CASSANDRA-18959) * ClientRequestSize metrics should not treat CONTAINS restrictions as being equality-based (CASSANDRA-18896) * Add support for vector search in SAI (CASSANDRA-18715) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
