]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39206 into master
authorSage Weil <sage@newdream.net>
Tue, 2 Feb 2021 22:47:52 +0000 (17:47 -0500)
committerSage Weil <sage@newdream.net>
Tue, 2 Feb 2021 22:47:52 +0000 (17:47 -0500)
* 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>

Trivial merge