From: Sage Weil <sage@newdream.net>
Date: Sun, 28 May 2017 03:17:14 +0000 (-0500)
Subject: Merge pull request #15319 from liewegas/wip-upmap
X-Git-Tag: v12.1.0~57^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=420dd7ff02e2aad09ddda22875f9f0df27be633b;p=ceph.git

Merge pull request #15319 from liewegas/wip-upmap

mon,osd/OSDMap: a couple pg-upmap fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

420dd7ff02e2aad09ddda22875f9f0df27be633b