From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 6 Sep 2019 05:51:48 +0000 (+0800)
Subject: Merge pull request #29985 from xiexingguo/wip-41514-plus
X-Git-Tag: v15.1.0~1656
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=49addda5707f06b90746bee96b82c4d77a23951b;p=ceph-ci.git

Merge pull request #29985 from xiexingguo/wip-41514-plus

osd/PrimaryLogPG: cancel in-flight manifest ops on interval changing; fix race with scrub

Reviewed-by: Myoungwon Oh <ommw@sk.com>
---

49addda5707f06b90746bee96b82c4d77a23951b