From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Fri, 7 Jul 2017 22:15:58 +0000 (-0700)
Subject: Merge pull request #16078 from xiexingguo/wip-misc
X-Git-Tag: v12.1.1~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=795eccfe212ce3061b7f731c3a75367c148f7ae8;p=ceph.git

Merge pull request #16078 from xiexingguo/wip-misc

mon, osd: misc fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

795eccfe212ce3061b7f731c3a75367c148f7ae8