]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14274 from liewegas/wip-osd-beacon-fix
authorKefu Chai <tchaikov@gmail.com>
Mon, 3 Apr 2017 07:16:05 +0000 (15:16 +0800)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2017 07:16:05 +0000 (15:16 +0800)
osd: fix some osd beacon bugs

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

Trivial merge