]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 646b2ff) | patch
mon/ConfigMonitor: fix loading of non-module mgr config options 24176/head
authorSage Weil <sage@redhat.com>
Fri, 31 Aug 2018 22:04:42 +0000 (17:04 -0500)
committerPrashant D <pdhange@redhat.com>
Wed, 19 Sep 2018 05:29:44 +0000 (01:29 -0400)
commite8f6eeed0ea1f0f775c0aba5136bcccfa5159388
tree768263a2236759ac9bdab2e11d28e73f0262803ftree | snapshot
parent646b2fffbc97e45c9c22a14b4ac89f084b26bbfdcommit | diff
mon/ConfigMonitor: fix loading of non-module mgr config options

"*/mgr/*" is special (including "global/mgr/*" and "mgr/mgr/*" and
"mgr.foo/mgr/*".  "mgr/*" is wrong.

Fixes: http://tracker.ceph.com/issues/35076
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b56984645c355bca5478e7ffd4629341477a50e4)

Conflicts:
src/mon/ConfigMonitor.cc : Resovled in load_config
src/mon/ConfigMonitor.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.