From: Sage Weil <sage@newdream.net>
Date: Wed, 28 Apr 2021 18:25:30 +0000 (-0400)
Subject: Merge PR #41049 into master
X-Git-Tag: v17.1.0~2125
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b70eed08879696a229865e445ddf351137c3302;p=ceph.git

Merge PR #41049 into master

* refs/pull/41049/head:
	cephadm: re-assimilate user provided conf after mgr created

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

1b70eed08879696a229865e445ddf351137c3302