From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 11 Mar 2019 19:44:26 +0000 (-0700)
Subject: Merge pull request #26127 from xiexingguo/wip-luminous-upmap-fixes
X-Git-Tag: v12.2.12~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf090fa536b60c00cd6688da0b6c0505437507c2;p=ceph.git

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

luminous: osd: backport recent upmap fixes

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

bf090fa536b60c00cd6688da0b6c0505437507c2