From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 03:18:26 +0000 (-0600)
Subject: Merge PR #33602 into master
X-Git-Tag: v15.1.1~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0f50e4f24e24f974aa824ed2dfe695fa45bb45e;p=ceph.git

Merge PR #33602 into master

* refs/pull/33602/head:
	mgr/cephadm/osd: call synchronous _remove_daemon()
	mgr/cephadm/osd: Add pytest for osd removal
	mgr/cephadm/osd: delete transitional attributes
	mgr/cephadm: Move remove osd code to osd.py

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>
---

f0f50e4f24e24f974aa824ed2dfe695fa45bb45e