RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26986 into nautilus

Browse Source 
* refs/pull/26986/head:
	mgr: Make 3rd parameter optional in ceph_get_module_option

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-03-15 16:43:33 -05:00
commit 8daf2885bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mgr/BaseMgrModule.cc
View File

@ -401,7 +401,7 @@ ceph_get_module_option(BaseMgrModule *self, PyObject *args)
char *module = nullptr;
char *key = nullptr;
char *prefix = nullptr;
if (!PyArg_ParseTuple(args, "ssz:ceph_get_module_option", &module, &key,
if (!PyArg_ParseTuple(args, "ss|s:ceph_get_module_option", &module, &key,
&prefix)) {
derr << "Invalid args!" << dendl;
return nullptr;

2
src/mgr/BaseMgrStandbyModule.cc
View File

@ -65,7 +65,7 @@ ceph_get_module_option(BaseMgrStandbyModule *self, PyObject *args)
{
char *what = nullptr;
char *prefix = nullptr;
if (!PyArg_ParseTuple(args, "sz:ceph_get_module_option", &what, &prefix)) {
if (!PyArg_ParseTuple(args, "s|s:ceph_get_module_option", &what, &prefix)) {
derr << "Invalid args!" << dendl;
return nullptr;
}