From 593db826b2f696316bfc7122facdd12a996e0dc7 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Fri, 22 Nov 2019 11:04:35 -0800 Subject: [PATCH] removed accidental merge code --- documentation/sphinx/source/release-notes.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/documentation/sphinx/source/release-notes.rst b/documentation/sphinx/source/release-notes.rst index bd75f5512e..eaaecbac70 100644 --- a/documentation/sphinx/source/release-notes.rst +++ b/documentation/sphinx/source/release-notes.rst @@ -8,12 +8,9 @@ Release Notes Fixes ----- -<<<<<<< HEAD * Clients could hang indefinitely on reads if all storage servers holding a keyrange were removed from a cluster since the last time the client read a key in the range. `(PR #2377) `_. * In rare scenarios, status could falsely report no replicas remain of some data. `(PR #2380) `_. -======= * Latency band tracking could fail to configure correctly after a recovery or upon process startup. `(PR #2371) `_. ->>>>>>> dd3b30a5b519bee972fd400f63ee1137dd29d2d7 6.2.10 ======