From: Sage Weil <sage@newdream.net>
Date: Wed, 5 May 2021 18:08:11 +0000 (-0400)
Subject: Merge PR #41147 into master
X-Git-Tag: v17.1.0~2064
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b36bab6f2d63a8265f9b853ce18d76536138c131;p=ceph.git

Merge PR #41147 into master

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

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

b36bab6f2d63a8265f9b853ce18d76536138c131