From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Jan 2020 20:04:59 +0000 (-0600)
Subject: Merge PR #32786 into master
X-Git-Tag: v15.1.0~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71a65fdfc5b6432f9b1e49dc93827a0ab471e1b3;p=ceph.git

Merge PR #32786 into master

* 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>
---

71a65fdfc5b6432f9b1e49dc93827a0ab471e1b3