]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #28978 into master
authorSage Weil <sage@redhat.com>
Fri, 12 Jul 2019 22:21:05 +0000 (17:21 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Jul 2019 22:21:05 +0000 (17:21 -0500)
* refs/pull/28978/head:
qa/tasks/mgr/dashboard/test_health: fix test_full_health test
mon: use per-pool stats only when all OSDs are reporting
osd: report whether we have per-pool stats
osd/osd_types: osd_stat_t: include num_per_pool_osds member

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
1  2 
src/osd/osd_types.cc
src/osd/osd_types.h

Simple merge
Simple merge