From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 13 Dec 2018 05:54:59 +0000 (+0800)
Subject: Merge pull request #25419 from xiexingguo/wip-mimic-upmap-fixes
X-Git-Tag: v13.2.3~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a64198e24492cde465cb3235813a30945003456a;p=ceph.git

Merge pull request #25419 from xiexingguo/wip-mimic-upmap-fixes

mimic: osd: backport recent upmap fixes

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

a64198e24492cde465cb3235813a30945003456a