From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 14 Aug 2018 16:41:01 +0000 (-0700)
Subject: Merge PR #23470 into master
X-Git-Tag: v14.0.1~520^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a807a7ebf0d5bfcf528bd3aafc02eb0c9fb6b158;p=ceph.git

Merge PR #23470 into master

* refs/pull/23470/head:
	tools/cephfs-shell: unable to copy files to a sub-directory from local file system

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

a807a7ebf0d5bfcf528bd3aafc02eb0c9fb6b158