From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Dec 2021 04:54:25 +0000 (-0500)
Subject: Merge PR #44228 into master
X-Git-Tag: v17.1.0~220
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12bf02acc3640a84880400b3b8eed4929d087344;p=ceph.git

Merge PR #44228 into master

* refs/pull/44228/head:
	qa/suites/orch/cephadm/osds: test 'ceph cephadm osd activate'
	mgr/cephadm/services/osd: skip found osds that already have daemons
	mgr/cephadm: allow activation of OSDs that have previously started

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
---

12bf02acc3640a84880400b3b8eed4929d087344