]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit5db4bddfafb23ece96d90a224efd0b50e308222c
treeb3ab9ed2289b0a5f24b257ca5ed97f1d71a01f44
parentd66cc42d7e865b9ce05e08b02247f86c757d248d
parente8520eba527998dc8803e204c75691d103f178ce
Merge PR #33123 into master

* refs/pull/33123/head:
qa/tasks/cephadm: deploy node-exporter
mgr/orch: deploy node-exporter

Reviewed-by: Sebastian Wagner <swagner@suse.com>
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