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 e1ddc34f584ec0dd72a6197604109a97e2605376
Merge: 1ba458c900 4093be5295
Author: Brandon Williams <[email protected]>
AuthorDate: Fri Sep 8 09:08:49 2023 -0500

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                        |  8 ++
 .../apache/cassandra/tools/nodetool/Repair.java    |  2 +-
 .../cassandra/tools/NodeToolCommandTest.java       | 85 ++++++++++++++++++++++
 3 files changed, 94 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 30cf57cba5,0622021b79..82b022fc40
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,14 +1,16 @@@
 -5.0-alpha2
 +5.1
 + * Clean up obsolete functions and simplify cql_version handling in cqlsh 
(CASSANDRA-18787)
 +Merged from 5.0:
   * Fix SAI's SegmentMetadata min and max primary keys (CASSANDRA-18734)
   * Remove commons-codec dependency (CASSANDRA-18772)
+ Merged from 4.1:
+  * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466)
+ Merged from 4.0:
+ Merged from 3.11:
+ Merged from 3.0:
+  * Add cqlshrc.sample and credentials.sample into Debian package 
(CASSANDRA-18818)
+ 
+ 5.0-alpha1
   * Fix rpm installations to work with jdk17 (CASSANDRA-18817)
   * Fix Depends and Build-Depends for Java for Debian packages 
(CASSANDRA-18809)
   * Update command line flags --add-exports and --add-opens for JDK17 
(CASSANDRA-18439)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to