From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 21 Aug 2018 21:38:54 +0000 (-0700)
Subject: Merge PR #23635 into master
X-Git-Tag: v14.0.1~527
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7a69ebbce76b5ae2fc46a07a27d009366f31a174;p=ceph.git

Merge PR #23635 into master

* refs/pull/23635/head:
	mds: use monotonic clock in beacon
	mds: simplify beacon init

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

7a69ebbce76b5ae2fc46a07a27d009366f31a174