From: Sage Weil <sage@redhat.com>
Date: Thu, 29 Nov 2018 20:25:19 +0000 (-0600)
Subject: Merge PR #25303 into master
X-Git-Tag: v14.1.0~753
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=706c5d59f2c04a0640b641d1cdc941f5b3e2cc3e;p=ceph.git

Merge PR #25303 into master

* refs/pull/25303/head:
	mgr/DaemonState: fix get_config_defaults locking

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

706c5d59f2c04a0640b641d1cdc941f5b3e2cc3e