From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 1 Apr 2019 21:46:25 +0000 (-0700)
Subject: Merge PR #27063 into master
X-Git-Tag: v15.0.0~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0472cd6ed8ad4b2f7b248d7d80a0a1b7a3e6ff17;p=ceph.git

Merge PR #27063 into master

* refs/pull/27063/head:
	mds: there is an assertion when calling Beacon::shutdown()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

0472cd6ed8ad4b2f7b248d7d80a0a1b7a3e6ff17