]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36487 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 10 Aug 2020 19:55:56 +0000 (12:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 10 Aug 2020 19:55:56 +0000 (12:55 -0700)
* refs/pull/36487/head:
mds: avoid calling g_conf().get_val() in MDSRank::heartbeat_reset()

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

Trivial merge