From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 1 Oct 2019 08:21:16 +0000 (-0700)
Subject: Merge PR #30341 into master
X-Git-Tag: v15.1.0~1358
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59d740d7cd2479d07404dc1ff60151b1648ca936;p=ceph.git

Merge PR #30341 into master

* refs/pull/30341/head:
	cephfs-shell: better complain info, when deleting non-empty directory

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
---

59d740d7cd2479d07404dc1ff60151b1648ca936