From: Sage Weil <sage@newdream.net>
Date: Mon, 10 Jul 2017 01:23:13 +0000 (-0500)
Subject: Merge pull request #16160 from xiexingguo/wip-misc2
X-Git-Tag: v12.1.1~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a197c5817f591fc514f55b9929982e90d90084e;p=ceph.git

Merge pull request #16160 from xiexingguo/wip-misc2

mon, osd: misc fixes and cleanups

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

5a197c5817f591fc514f55b9929982e90d90084e