From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 22 Dec 2018 01:13:05 +0000 (-0800)
Subject: Merge PR #25658 into master
X-Git-Tag: v14.1.0~561
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12aba241ec12d77491479ac29055dec0de28057d;p=ceph.git

Merge PR #25658 into master

* refs/pull/25658/head:
	MDSMonitor: allow beacons from stopping MDS that was laggy

Reviewed-by: Sage Weil <sage@redhat.com>
---

12aba241ec12d77491479ac29055dec0de28057d