From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 10 Apr 2018 04:33:00 +0000 (-0700)
Subject: Merge PR #21144 into master
X-Git-Tag: v13.1.0~357
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3718d59784c57fa9daf702fc80087f536a6292c;p=ceph-ci.git

Merge PR #21144 into master

* refs/pull/21144/head:
	mds: fix unhealth heartbeat during rejoin

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

a3718d59784c57fa9daf702fc80087f536a6292c