]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25190 into master
authorSage Weil <sage@redhat.com>
Tue, 18 Dec 2018 16:47:52 +0000 (10:47 -0600)
committerSage Weil <sage@redhat.com>
Tue, 18 Dec 2018 16:47:52 +0000 (10:47 -0600)
* refs/pull/25190/head:
mgr/prometheus: adjust to new 'df' fields
mon/Monitor: fix newline between df section
doc: update docs for new ceph df output
mon/PGMap: break down RAW usage by device class
mon/PGMap: tweak df headers
mon/PGMap: GLOBAL -> RAW STORAGE in 'df' output
mon/PGMap: dump_fs_stats -> dump_cluster_stats

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/pybind/mgr/prometheus/module.py

Simple merge