This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7d84ad936622454afb01424d8a3c6db511654d60
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Apr 7 13:42:18 2023 -0500
Revert "fix error in conflict edit"
This reverts commit 21c3e9731ceb773ef6010dcfea9c8ede3204fda2.
---
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGES.txt b/CHANGES.txt
index e14e315604..31c5213fad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
Merged from 3.11:
* Suppress CVE-2022-45688 (CASSANDRA-18389)
+ * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
Merged from 3.0:
* Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
* Fix the ordering of sstables when running sstableupgrade tool
(CASSANDRA-18143)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
