]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #35608 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jun 2020 16:31:34 +0000 (09:31 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jun 2020 16:31:34 +0000 (09:31 -0700)
* refs/pull/35608/head:
cephfs_features: add metric collection feature support

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>

Trivial merge