From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 May 2021 20:43:28 +0000 (-0700)
Subject: Merge PR #41357 into master
X-Git-Tag: v17.1.0~1927
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5d8d691da2b96981a6d5d11e4c4142a2e08c930b;p=ceph-ci.git

Merge PR #41357 into master

* refs/pull/41357/head:
	mds: do not assert when receiving a unknow metric type

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

5d8d691da2b96981a6d5d11e4c4142a2e08c930b