This is an automated email from the ASF dual-hosted git repository. polandll pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 527f12e3eecb6a403eb0520324d606f2f4f3ee7e Author: Lorina Poland <[email protected]> AuthorDate: Fri Apr 7 11:12:09 2023 -0700 fix error in conflict edit --- CHANGES.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f8d40a7aaf..536c672b7c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,9 +7,7 @@ Merged from 4.0: * Update zstd-jni library to version 1.5.5 (CASSANDRA-18429) Merged from 3.11: -3.11.15 * 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) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
