From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 3 Aug 2018 16:22:24 +0000 (-0700)
Subject: Merge PR #23158 into master
X-Git-Tag: v14.0.1~682
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c2a671a4b6d5a13d4ebfa4cb4d580b9683e5dc5b;p=ceph.git

Merge PR #23158 into master

This is a milestone in the CephFS shell project. QA testing is still in the
works and will be merged separately. Installation code via CMake will also be
written in another PR.

* refs/pull/23158/head:
	doc: add cephfs-shell to cephfs doc index
	cephfs-shell: add new CephFS shell

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

c2a671a4b6d5a13d4ebfa4cb4d580b9683e5dc5b
diff --cc src/pybind/cephfs/cephfs.pyx
index 804196f6854ff,039397dafbe7b..4544fb15a5825
mode 100644,100755..100755
--- a/src/pybind/cephfs/cephfs.pyx
+++ b/src/pybind/cephfs/cephfs.pyx