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

Merge pull request #27224 from xiexingguo/wip-luminous-upmap-backports

luminous: osd: backport recent upmap fixes

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

d3c74732578b3665df9e3b50526d10c27b4a584f