From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Fri, 5 Aug 2016 15:14:02 +0000 (-0700)
Subject: Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28
X-Git-Tag: ses5-milestone5~206
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb7424e8607841122f64da7d445d28bc252c9519;p=ceph.git

Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28

osd/OSDMonitor: misc. fixes

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

bb7424e8607841122f64da7d445d28bc252c9519