From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Mar 2019 16:35:45 +0000 (-0500)
Subject: Merge PR #27155 into master
X-Git-Tag: v15.0.0~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1dad9d2fe1407eafd834749dd223fd918214a6da;p=ceph.git

Merge PR #27155 into master

* refs/pull/27155/head:
	mon/ConfigMonitor: make 'config reset' idempotent

Reviewed-by: Sage Weil <sage@redhat.com>
---

1dad9d2fe1407eafd834749dd223fd918214a6da