]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #29964 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 6 Dec 2019 05:42:12 +0000 (21:42 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 6 Dec 2019 05:42:12 +0000 (21:42 -0800)
* refs/pull/29964/head:
qa/cephfs: test conf file reading for CephFS shell
qa/cephfs: allow passing conf to methods that runs shell command
qa/vstart_runner: add a method to create temporary file
test_cephfs_shell: update test since shell can now read ceph.conf
src/vstart.sh: add cephfs-shell section to ceph.conf
cephfs-shell: read shell variables from ceph.conf

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

Trivial merge