From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 13 Dec 2018 05:54:32 +0000 (+0800)
Subject: Merge pull request #25418 from xiexingguo/wip-luminous-upmap-fixes
X-Git-Tag: v12.2.11~109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2083a34e86eaeef06e951eb2ff056457d029734b;p=ceph.git

Merge pull request #25418 from xiexingguo/wip-luminous-upmap-fixes

luminous: osd: backport recent upmap fixes

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

2083a34e86eaeef06e951eb2ff056457d029734b