From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 8 Apr 2019 16:26:01 +0000 (-0700)
Subject: Merge PR #27437 into master
X-Git-Tag: v15.1.0~3000
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b90d566d340a668aa16f46e484caf80f9600bbe6;p=ceph.git

Merge PR #27437 into master

* refs/pull/27437/head:
	vstart: add an alias for cephfs-shell to vstart_environment.sh

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

b90d566d340a668aa16f46e484caf80f9600bbe6