From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Dec 2018 20:00:52 +0000 (-0600)
Subject: Merge PR #25402 into master
X-Git-Tag: v14.1.0~641
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74594b1798ee5d199b0bb9cf186737e9e9e7585e;p=ceph.git

Merge PR #25402 into master

* 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>
---

74594b1798ee5d199b0bb9cf186737e9e9e7585e