From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 22 Aug 2017 14:50:24 +0000 (+0800)
Subject: Merge pull request #17039 from dzafman/wip-18206
X-Git-Tag: v13.0.0~43
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=85b63670d937a36a1c8094c6626039b80968b1bd;p=ceph.git

Merge pull request #17039 from dzafman/wip-18206

osd: Fixes for osd_scrub_during_recovery handling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

85b63670d937a36a1c8094c6626039b80968b1bd