From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Apr 2018 02:31:19 +0000 (-0500)
Subject: Merge PR #20760 into wip-sage-testing-20180407.023110
X-Git-Tag: v13.1.0~385
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43978fc68de20398dec5175b84cc41ce61c6be71;p=ceph.git

Merge PR #20760 into wip-sage-testing-20180407.023110

* refs/pull/20760/head:
	mon/ConfigMonitor: add 'config reset' command
	mon/ConfigMonitor: add 'config log' command
	mon/ConfigMap: add ConfigChangeSet
	mon/ConfigMonitor: avoid no-op updates
	mon/ConfigMonitor: maintain history of all config changes
---

43978fc68de20398dec5175b84cc41ce61c6be71