]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39595 into pacific
authorSage Weil <sage@newdream.net>
Sun, 28 Feb 2021 16:06:56 +0000 (10:06 -0600)
committerSage Weil <sage@newdream.net>
Sun, 28 Feb 2021 16:06:56 +0000 (10:06 -0600)
* refs/pull/39595/head:
mon/KVMonitor: fix 'osd new' cross-service commit
mgr/ActivePyModules.cc: use wrappers for acquiring/releasing GIL
mgr: rename config_prefix -> mgr_store_prefix
mgr: fix config option prefix
mgr/MgrStandby: simplify weird code
mgr_module: get_foreign_ceph_option(entity, name)
mgr: maintain a ConfigMap copy
mon/ConfigMap: factor out parse_key helper
mon/ConfigMap: fix stray option leak
mgr: use new kv subscription for mgr/, device/, config/
mon: allow subscription to kv/config-key data
mon: convert ConfigKeyService -> KVMonitor

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge