]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #33963 from rosinL/wip-40668
authorKefu Chai <kchai@redhat.com>
Sun, 4 Oct 2020 05:32:09 +0000 (13:32 +0800)
committerGitHub <noreply@github.com>
Sun, 4 Oct 2020 05:32:09 +0000 (13:32 +0800)
mon/OSDMonitor: Add a safety builtin to mon_osd_report_timeout

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
1  2 
src/crimson/osd/osd.cc
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h
src/osd/OSD.cc

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