You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2023/11/01 22:17:43 UTC
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
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 bb686fc27d4a43bc69dc9c4e4934cd4e65c3bdb5
Merge: 7377d5501d dca76145c2
Author: David Capwell <dc...@apache.org>
AuthorDate: Wed Nov 1 15:12:51 2023 -0700
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/Verb.java | 12 +--
.../cassandra/repair/RepairMessageVerbHandler.java | 17 ++-
.../org/apache/cassandra/repair/SharedContext.java | 115 +++++++++++++++++++++
.../repair/consistent/ConsistentSession.java | 2 +-
.../repair/consistent/CoordinatorSession.java | 57 ++++++----
.../repair/consistent/CoordinatorSessions.java | 24 ++++-
.../cassandra/repair/consistent/LocalSessions.java | 77 ++++++++++----
.../cassandra/repair/messages/FailSession.java | 6 ++
.../cassandra/repair/messages/FinalizeCommit.java | 6 ++
.../cassandra/repair/messages/FinalizePromise.java | 6 ++
.../cassandra/repair/messages/FinalizePropose.java | 6 ++
.../repair/messages/PrepareConsistentRequest.java | 6 ++
.../repair/messages/PrepareConsistentResponse.java | 6 ++
.../cassandra/repair/messages/RepairMessage.java | 32 +++++-
.../org/apache/cassandra/net/MatcherResponse.java | 13 ++-
.../repair/ConcurrentIrWithPreviewFuzzTest.java | 18 +++-
.../cassandra/repair/FailingRepairFuzzTest.java | 1 +
.../org/apache/cassandra/repair/FuzzTestBase.java | 36 +++++--
.../cassandra/repair/SlowMessageFuzzTest.java | 1 +
.../repair/consistent/CoordinatorSessionTest.java | 64 ++++++------
.../repair/consistent/CoordinatorSessionsTest.java | 24 +++--
.../repair/consistent/LocalSessionTest.java | 42 +++++---
.../cassandra/repair/consistent/MockMessaging.java | 88 ++++++++++++++++
24 files changed, 524 insertions(+), 136 deletions(-)
diff --cc CHANGES.txt
index 3ca783fb97,f288f3206e..c7bbed34a0
--- 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 retries to IR messages (CASSANDRA-18962)
* 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org