From: Sage Weil <sage@redhat.com>
Date: Sun, 24 Nov 2019 02:29:52 +0000 (-0600)
Subject: Merge PR #31807 into master
X-Git-Tag: v15.1.0~780
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=130b7e75c2482e72a75f20d6e981da47527dbeeb;p=ceph.git

Merge PR #31807 into master

* refs/pull/31807/head:
	mgr/PyModule: correctly remove config options

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

130b7e75c2482e72a75f20d6e981da47527dbeeb