From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 20:25:05 +0000 (-0600)
Subject: Merge PR #33704 into master
X-Git-Tag: v15.1.1~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54e4d2b6630014f15bbc36c9036aa5d6febf32a0;p=ceph.git

Merge PR #33704 into master

* refs/pull/33704/head:
	mgr/cephadm: avoid racing updates to spec dict
	mgr/cephadm: make _do_upgrade work synchronously
	mgr/cephadm/tests/test_cephadm: remove broken rgw_update_fail test
	mgr/cephadm: make _apply_service move services
	mgr/cephadm: log when we create, destroy daemons
	mgr/cephadm: drop async_map_completion decorators from create funcs
	mgr/cephadm: _create_osd -> _create_osds
	mgr/cephadm: _remove_daemon -> _remove_daemons

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

54e4d2b6630014f15bbc36c9036aa5d6febf32a0