From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 30 Jan 2019 16:57:45 +0000 (-0800)
Subject: Merge pull request #26128 from xiexingguo/wip-mimic-upmap-fixes
X-Git-Tag: v13.2.5~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4ec9471d0f492e4b50073ff2e62483803d7797e;p=ceph.git

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

mimic: osd: backport recent upmap fixes

Reviewed-by:  Venky Shankar <vshankar@redhat.com>
---

a4ec9471d0f492e4b50073ff2e62483803d7797e