From: Sage Weil <sage@newdream.net>
Date: Tue, 27 Jun 2017 15:19:41 +0000 (-0500)
Subject: Merge pull request #15917 from xiexingguo/wip-upmap-fixes
X-Git-Tag: v12.1.1~264
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6087a34e8d332cb826f4ea14ab3960aeea6a9c6;p=ceph-ci.git

Merge pull request #15917 from xiexingguo/wip-upmap-fixes

mon/OSDMonitor: a couple of upmap and other fixes

Reviewed-by: Sage Weil <sage@redhat.com>
---

f6087a34e8d332cb826f4ea14ab3960aeea6a9c6