From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 22 Dec 2018 20:27:57 +0000 (-0800)
Subject: Merge PR #23126 into master
X-Git-Tag: v14.1.0~554
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e8c6838af4fdc816f5bb4edfd57a1ad26d9d8e8;p=ceph.git

Merge PR #23126 into master

* refs/pull/23126/head:
	wherever: guard handle_conf_change() from concurrent execution
	config: drop config_proxy::lock when invoking config observer

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

7e8c6838af4fdc816f5bb4edfd57a1ad26d9d8e8