]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33123 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 20:50:20 +0000 (14:50 -0600)
committerSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 20:50:20 +0000 (14:50 -0600)
* refs/pull/33123/head:
qa/tasks/cephadm: deploy node-exporter
mgr/orch: deploy node-exporter

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py

Simple merge
Simple merge