]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #29334 into master
authorSage Weil <sage@redhat.com>
Thu, 1 Aug 2019 01:27:27 +0000 (20:27 -0500)
committerSage Weil <sage@redhat.com>
Thu, 1 Aug 2019 01:27:27 +0000 (20:27 -0500)
* refs/pull/29334/head:
qa/tasks/mgr/dashboard/test_mgr_module: adjust expected schema
mgr/telemetry: separate out cluster config vs running daemons
mgr/telemetry: include any config options that are customized

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
1  2 
qa/tasks/mgr/dashboard/test_mgr_module.py
src/pybind/mgr/telemetry/module.py

Simple merge