]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #25402 into master
authorSage Weil <sage@redhat.com>
Wed, 12 Dec 2018 20:00:52 +0000 (14:00 -0600)
committerSage Weil <sage@redhat.com>
Wed, 12 Dec 2018 20:00:52 +0000 (14:00 -0600)
* refs/pull/25402/head:
pybind/mgr: rename get_option -> get_ceph_option
pybind/mgr: add get_ceph_option to standby module interface
ceph.spec.in: add xmlsec1 dependency for dashboard make check
mgr: rename internal ceph_set_config -> ceph_set_module_option
pybind/mgr: set_config -> set_module_option
pybind/mgr: get_config -> get_module_option
mgr: rename internal get_config -> get_module_option
pybind/mgr: OPTIONS -> MODULE_OPTIONS

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tim Serong <tserong@suse.com>
1  2 
ceph.spec.in
src/pybind/mgr/balancer/module.py
src/pybind/mgr/devicehealth/module.py
src/pybind/mgr/orchestrator_cli/module.py
src/pybind/mgr/prometheus/module.py

diff --cc ceph.spec.in
Simple merge
Simple merge
Simple merge
Simple merge