]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83c6921 3eeaefd)
Merge PR #33897 into octopus
authorSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 12:37:10 +0000 (07:37 -0500)
committerSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 12:37:10 +0000 (07:37 -0500)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.