]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #32786 into master
authorSage Weil <sage@redhat.com>
Fri, 24 Jan 2020 20:04:59 +0000 (14:04 -0600)
committerSage Weil <sage@redhat.com>
Fri, 24 Jan 2020 20:04:59 +0000 (14:04 -0600)
* refs/pull/32786/head:
mon/ConfigMonitor: put global/ keys in global section
mon/ConfigMonitor: transition old keys to have global/ prefix
mon/ConfigMonitor: always prefix global config keys with global/
mon/ConfigMonitor: switch to use pending_cleanup boost::optional

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

Trivial merge