From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 9 May 2019 15:46:53 +0000 (-0700)
Subject: Merge pull request #27963 from xiexingguo/wip-mimic-upmap-fixes
X-Git-Tag: v13.2.6~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2acac389cc782e46d307cd052d90977dc380360;p=ceph.git

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

mimic: crush: backport recent upmap fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
---

a2acac389cc782e46d307cd052d90977dc380360