fix error in conflict edit

This commit is contained in:
Lorina Poland 2023-04-07 11:10:46 -07:00
parent 9a3a37c5b3
commit 21c3e9731c
1 changed files with 0 additions and 1 deletions

View File

@ -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)