]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23307 into master
authorSage Weil <sage@redhat.com>
Fri, 3 Aug 2018 15:56:40 +0000 (10:56 -0500)
committerSage Weil <sage@redhat.com>
Fri, 3 Aug 2018 15:56:40 +0000 (10:56 -0500)
* refs/pull/23307/head:
osd/OSD: fix HeartbeatInfo.is_healthy() check
osd/OSD: use first_tx to calculate failed_for
osd: refactor heartbeat health check

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

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