From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 18 Jul 2018 01:47:35 +0000 (-0700)
Subject: Merge PR #22966 into master
X-Git-Tag: v14.0.1~854
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e18ac7217be47729b4f7feea5a18cb6738e1da6;p=ceph.git

Merge PR #22966 into master

* refs/pull/22966/head:
	mds: clarify doc string for mds_beacon_grace

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

3e18ac7217be47729b4f7feea5a18cb6738e1da6