From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 25 Feb 2021 03:34:23 +0000 (-0800)
Subject: Merge PR #38914 into master
X-Git-Tag: v17.1.0~2847
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66409b22a9dde4b7c06837260002a35eb5d7ea21;p=ceph.git

Merge PR #38914 into master

* refs/pull/38914/head:
	qa: bump osd heartbeat grace for ffsb workload

Reviewed-by: Ramana Raja <rraja@redhat.com>
---

66409b22a9dde4b7c06837260002a35eb5d7ea21