]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27198 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 4 Apr 2019 21:24:38 +0000 (14:24 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 4 Apr 2019 21:24:38 +0000 (14:24 -0700)
* refs/pull/27198/head:
vstart: generate environment script suitable for sourcing
cephfs-shell: fix mode of script in tree

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/vstart.sh

diff --cc src/vstart.sh
Simple merge