From: Sage Weil <sage@newdream.net>
Date: Wed, 12 May 2021 12:09:08 +0000 (-0500)
Subject: Merge PR #41182 into pacific
X-Git-Tag: v16.2.5~51^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fcccc2f27eaf9355aaf547716f17d1fee06ae832;p=ceph.git

Merge PR #41182 into pacific

* refs/pull/41182/head:
	ceph_test_rados_api_service: stop threads before asserting
	ceph_test_rados_api_service: more retries for servicemkap

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

fcccc2f27eaf9355aaf547716f17d1fee06ae832