Revert "fix error in conflict edit"

This reverts commit 21c3e9731c.
This commit is contained in:
Brandon Williams 2023-04-07 13:42:18 -05:00
parent 5d315f869d
commit 7d84ad9366
1 changed files with 1 additions and 0 deletions

View File

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