]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #41596 into pacific
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 10 Jun 2021 19:09:56 +0000 (12:09 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 10 Jun 2021 19:09:56 +0000 (12:09 -0700)
* refs/pull/41596/head:
mds: do not infinitely recursively print a metric
mds: do not assert when receiving a unknow metric type

Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge