From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Mar 2020 12:37:10 +0000 (-0500)
Subject: Merge PR #33897 into octopus
X-Git-Tag: v15.1.1~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=161a8330c4fbe593455aee5e003b5a4df0e167e5;p=ceph.git

Merge PR #33897 into octopus

* refs/pull/33897/head:
	mgr/PyModule: initialize options on standby class too
	Revert "pybind/mgr/mgr_module: fix standby module logging options"

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

161a8330c4fbe593455aee5e003b5a4df0e167e5