From 21c3e9731ceb773ef6010dcfea9c8ede3204fda2 Mon Sep 17 00:00:00 2001 From: Lorina Poland Date: Fri, 7 Apr 2023 11:10:46 -0700 Subject: [PATCH] fix error in conflict edit --- CHANGES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 31c5213fad..e14e315604 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,7 +8,6 @@ * 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)