From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 3 Apr 2017 07:16:05 +0000 (+0800)
Subject: Merge pull request #14274 from liewegas/wip-osd-beacon-fix
X-Git-Tag: v12.0.2~229
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d79d85bca5aefb965e4cc875981981429a1e57c1;p=ceph.git

Merge pull request #14274 from liewegas/wip-osd-beacon-fix

osd: fix some osd beacon bugs

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

d79d85bca5aefb965e4cc875981981429a1e57c1