From: Sage Weil <sage@newdream.net>
Date: Tue, 2 Feb 2021 22:47:52 +0000 (-0500)
Subject: Merge PR #39206 into master
X-Git-Tag: v17.1.0~3085
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cced65aab7a9786dd853e5c7e2f8ccecb698a321;p=ceph-ci.git

Merge PR #39206 into master

* refs/pull/39206/head:
	mgr/MetricTypes: condition encoding on feature bits

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

cced65aab7a9786dd853e5c7e2f8ccecb698a321