From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 16 Sep 2019 20:02:03 +0000 (-0700)
Subject: Merge PR #29735 into master
X-Git-Tag: v15.1.0~1530
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbfce1ad7a275813259a7f934b3232b249f5b6f8;p=ceph.git

Merge PR #29735 into master

* refs/pull/29735/head:
	mgr/volumes: cluster log when a purge thread bails out
	mgr/volumes: retry purging trash entries on intermittent error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

fbfce1ad7a275813259a7f934b3232b249f5b6f8