From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Mar 2021 15:16:22 +0000 (-0500)
Subject: Merge PR #40181 into pacific
X-Git-Tag: v16.2.0~98
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d998b1c2c5c6a18646cccf5a5558238b429d5bdb;p=ceph.git

Merge PR #40181 into pacific

* refs/pull/40181/head:
	mgr/prometheus: fix typo in get_collect_time_metrics

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

d998b1c2c5c6a18646cccf5a5558238b429d5bdb