From: Neha Ojha <nojha@redhat.com>
Date: Fri, 22 Nov 2019 19:47:49 +0000 (-0800)
Subject: Merge pull request #31657 from liewegas/fix-merge-vs-backoff
X-Git-Tag: v15.1.0~791
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=941807d88e7845c19e5b0698195153fca630825a;p=ceph-ci.git

Merge pull request #31657 from liewegas/fix-merge-vs-backoff

osd: release backoffs during merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
---

941807d88e7845c19e5b0698195153fca630825a