From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 14 Oct 2019 18:26:46 +0000 (-0700)
Subject: Merge PR #30585 into master
X-Git-Tag: v15.1.0~1257
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ed9c5f7f7e33f861113691c2a246383702faa110;p=ceph-ci.git

Merge PR #30585 into master

* refs/pull/30585/head:
	docs/cephfs-shell: update doc about pyscript
	cephfs-shell: make compatible with cmd2 versions after 0.9.13

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

ed9c5f7f7e33f861113691c2a246383702faa110