From: Patrick Donnelly Date: Fri, 6 Dec 2019 05:42:12 +0000 (-0800) Subject: Merge PR #29964 into master X-Git-Tag: v15.1.0~636 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88ef8147bc6fb4d74af414596bf42f6f95dc53aa;p=ceph.git Merge PR #29964 into master * 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 --- 88ef8147bc6fb4d74af414596bf42f6f95dc53aa