]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76885c1 6d1dd61)
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)
commit9edfc9578f4df6201602c95df6ea990bf10dc94d
treefd38798e63c8c243fb6d6cd612e52b36f5e97958tree | snapshot
parent76885c1a1397fb0d2c80c48083d74027cf9938e4commit | diff
parent6d1dd6181b847f8b04b20c7647a725d814583c70commit | diff
Merge PR #29334 into master

* 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>
qa/tasks/mgr/dashboard/test_mgr_module.py diff1 | diff2 | blob | history
src/pybind/mgr/telemetry/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.