From: Sage Weil <sage@redhat.com>
Date: Mon, 22 Jul 2019 18:38:13 +0000 (-0500)
Subject: Merge PR #29144 into master
X-Git-Tag: v15.1.0~2141
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46e4d1a0d564fed764341e6979fa190963baeae4;p=ceph.git

Merge PR #29144 into master

* refs/pull/29144/head:
	qa/tasks/ceph_manager: fix thrash_pg_upmap_items when no pools

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

46e4d1a0d564fed764341e6979fa190963baeae4