From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 10 Aug 2020 19:55:56 +0000 (-0700)
Subject: Merge PR #36487 into master
X-Git-Tag: v16.1.0~1458
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f951201c4c699c69ca4d6a69848544eb2c43371f;p=ceph.git

Merge PR #36487 into master

* refs/pull/36487/head:
	mds: avoid calling g_conf().get_val() in MDSRank::heartbeat_reset()

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

f951201c4c699c69ca4d6a69848544eb2c43371f