From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 7 Jun 2021 16:07:10 +0000 (-0700)
Subject: Merge PR #41485 into nautilus
X-Git-Tag: v14.2.22~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a10adc8ba2eadbf091335bf34aa3cbe06d8d18a8;p=ceph.git

Merge PR #41485 into nautilus

* refs/pull/41485/head:
	qa: avoid TypeError in cleanup

Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

a10adc8ba2eadbf091335bf34aa3cbe06d8d18a8