From: Sage Weil <sage@newdream.net>
Date: Tue, 19 Oct 2021 20:04:36 +0000 (-0400)
Subject: Merge PR #43556 into master
X-Git-Tag: v17.1.0~646
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e70065a737f41a9086d84cb828a7b740eca1e04;p=ceph.git

Merge PR #43556 into master

* refs/pull/43556/head:
	qa/suites/orch/cephadm/osds: add osd rm/zap/add test

Reviewed-by: Cory Snyder <csnyder@iland.com>
---

9e70065a737f41a9086d84cb828a7b740eca1e04
diff --cc .githubmap
index cde518fa6522c,cde518fa6522c..c5427b5cefc8c
--- a/.githubmap
+++ b/.githubmap
@@@ -140,3 -140,3 +140,4 @@@ yuvalif Yuval Lifshitz <ylifshit@redhat
  yuyuyu101 Haomai Wang <haomai@xsky.com>
  zdover23 Zac Dover <zac.dover@gmail.com>
  Thingee Mike Perez <miperez@redhat.com>
++cfsnyder Cory Snyder <csnyder@iland.com>