From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 4 Oct 2018 20:26:26 +0000 (-0700)
Subject: Merge PR #24375 into luminous
X-Git-Tag: v12.2.9~23
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8173b96370965daa8d35ff9d33db5ac4d99c4c33;p=ceph.git

Merge PR #24375 into luminous

* refs/pull/24375/head:
	mds: use monotonic waits in Beacon

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

8173b96370965daa8d35ff9d33db5ac4d99c4c33