From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Sat, 1 Dec 2018 10:23:33 +0000 (+0800)
Subject: Merge pull request #25126 from xiexingguo/wip-heartbeat-bs
X-Git-Tag: v14.1.0~743
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e50be3ef9b68f1fd5af94142555545496f0e1200;p=ceph-ci.git

Merge pull request #25126 from xiexingguo/wip-heartbeat-bs

osd: two heartbeat fixes

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

e50be3ef9b68f1fd5af94142555545496f0e1200