From: Andrew Kryczka <andrewkr@fb.com>
Date: Wed, 1 Feb 2023 03:51:00 +0000 (-0800)
Subject: add release note for GetMergeOperands() fix
X-Git-Tag: v7.10.2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a354a1197f6646a23e04d7fa526b458752b7095;p=rocksdb.git

add release note for GetMergeOperands() fix
---

diff --git a/HISTORY.md b/HISTORY.md
index f568ae7ed..6d7ebbb9b 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,7 @@
 ### Bug Fixes
 * Fixed a data race on `ColumnFamilyData::flush_reason` caused by concurrent flushes.
 * Fixed `DisableManualCompaction()` and `CompactRangeOptions::canceled` to cancel compactions even when they are waiting on conflicting compactions to finish
+* Fixed a bug in which a successful `GetMergeOperands()` could transiently return `Status::MergeInProgress()`
 
 ## 7.10.0 (01/23/2023)
 ### Behavior changes