From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Sep 2018 12:41:44 +0000 (-0500)
Subject: Merge PR #23949 into master
X-Git-Tag: v14.0.1~358
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff826e69c7ed48370277205d89b035dba2a511c5;p=ceph.git

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>
---

ff826e69c7ed48370277205d89b035dba2a511c5