]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #25126 from xiexingguo/wip-heartbeat-bs
authorXie Xingguo <xie.xingguo@zte.com.cn>
Sat, 1 Dec 2018 10:23:33 +0000 (18:23 +0800)
committerGitHub <noreply@github.com>
Sat, 1 Dec 2018 10:23:33 +0000 (18:23 +0800)
osd: two heartbeat fixes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge