From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 16 Oct 2018 14:52:54 +0000 (-0700)
Subject: Merge PR #24505 into master
X-Git-Tag: v14.0.1~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=299fc82ded6d0831089b11b568492829d98bada7;p=ceph.git

Merge PR #24505 into master

* refs/pull/24505/head:
	mds: wait shorter intervals if beacon not sent

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

299fc82ded6d0831089b11b568492829d98bada7