]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit161a8330c4fbe593455aee5e003b5a4df0e167e5
treefdd32f9b9065d8051fa39fa6748550bf1a7988c8tree | snapshot
parent83c6921920688dd2d3bec984136a69e1f86bd2c5commit | diff
parent3eeaefddb98b76e319b47891d6cb41cff48cccffcommit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.