From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Nov 2019 18:36:45 +0000 (-0600)
Subject: Merge PR #31420 into master
X-Git-Tag: v15.1.0~1028
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ba87385bcc9f8e675c559d971b390699b88740d;p=ceph.git

Merge PR #31420 into master

* refs/pull/31420/head:
	ceph-daemon: do not screw up line splitting
	mgr/ssh: raise RuntimeError when ceph-daemon invocation fails

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

9ba87385bcc9f8e675c559d971b390699b88740d