From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Sat, 24 Aug 2019 05:51:21 +0000 (+0800)
Subject: Merge pull request #29754 from xiexingguo/wip-inc-recovery-3
X-Git-Tag: v15.1.0~1780
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dce9704c28cdffd4f56f4e91bfe129e393c1b0d8;p=ceph-ci.git

Merge pull request #29754 from xiexingguo/wip-inc-recovery-3

osd: misc inc-recovery compat fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

dce9704c28cdffd4f56f4e91bfe129e393c1b0d8