]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #23949 into master
authorSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 12:41:44 +0000 (07:41 -0500)
committerSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 12:41:44 +0000 (07:41 -0500)
commitff826e69c7ed48370277205d89b035dba2a511c5
tree78ae9b65026a9532a5bbc69ada673726344457bf
parent838958daa4d4febd59a3b1f72ecce7bef585eef9
parent91a2d408a9349db08e916e2145040df8b1f17e14
Merge PR #23949 into master

* refs/pull/23949/head:
mon/OSDMonitor: invalidate max_failed_since on cancel_report

Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.h