From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Feb 2020 18:17:17 +0000 (-0600)
Subject: Merge PR #33162 into master
X-Git-Tag: v15.1.1~486
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=786aa2904afc6eb9ba4abb47e4dacf7786fec847;p=ceph.git

Merge PR #33162 into master

* refs/pull/33162/head:
	cephadm: KillMode=none in unit file
	cephadm: clean up unit string syntax a bit

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

786aa2904afc6eb9ba4abb47e4dacf7786fec847