From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 25 Aug 2018 19:50:43 +0000 (-0700)
Subject: Merge PR #23640 into master
X-Git-Tag: v14.0.1~490
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bc05936309f7ec7a67f96227c636800b6f82c5fb;p=ceph-ci.git

Merge PR #23640 into master

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

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
---

bc05936309f7ec7a67f96227c636800b6f82c5fb