From: Patrick Donnelly Date: Tue, 7 Jan 2020 22:09:29 +0000 (-0800) Subject: Merge PR #32347 into master X-Git-Tag: v15.1.0~296 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b132cb913942ca1f635f111d17bcbfb3a572e8f;p=ceph.git Merge PR #32347 into master * refs/pull/32347/head: cephfs-shell: set shell.exit_code to 1 when reading conf fails cephfs-shell: cephfs-shell breaks when conf_get() returns None cephfs-shell: use libcephfs for exceptions cephfs-shell: fix incorrect use of str.strip Reviewed-by: Patrick Donnelly --- 2b132cb913942ca1f635f111d17bcbfb3a572e8f