]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #42107 into master
authorSage Weil <sage@newdream.net>
Thu, 1 Jul 2021 13:11:09 +0000 (09:11 -0400)
committerSage Weil <sage@newdream.net>
Thu, 1 Jul 2021 13:11:09 +0000 (09:11 -0400)
* refs/pull/42107/head:
mgr/ActivePyModules: streamline mgr_ips a bit
mgr/ActivePyModules: don't take unnecessary lock
pybind/mgr/mgr_module: use get("mgr_ips") for standby get_mgr_ip()
mgr: add get() for standby modules

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
1  2 
src/pybind/mgr/ceph_module.pyi
src/pybind/mgr/mgr_module.py

Simple merge
Simple merge