]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32201 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 10 Jan 2020 22:23:03 +0000 (14:23 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 10 Jan 2020 22:23:03 +0000 (14:23 -0800)
* refs/pull/32201/head:
mds: maintain client provided metric flags in client metadata
mds: add feature_bitset_t::dump()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/Server.cc

Simple merge