]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #28847 into master
authorSage Weil <sage@redhat.com>
Fri, 26 Jul 2019 01:15:17 +0000 (20:15 -0500)
committerSage Weil <sage@redhat.com>
Fri, 26 Jul 2019 01:15:17 +0000 (20:15 -0500)
* refs/pull/28847/head:
doc/mgr/telemetry: update
mgr/telemetry: move contact info to an 'ident' channel
mgr/telemetry: accept channel list to 'telemetry show'
mgr/telemetry: always generate new report for 'telemetry show'
mgr/telemetry: add 'device' channel and call out to devicehealth module
mgr/telemetry: add telemetry channel 'device'
mgr/telemetry: add separate channels

Reviewed-by: Dan Mick <dmick@redhat.com>
1  2 
src/pybind/mgr/devicehealth/module.py
src/pybind/mgr/telemetry/module.py

Simple merge
Simple merge