From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Jan 2020 03:31:14 +0000 (-0600)
Subject: Merge PR #32970 into master
X-Git-Tag: v15.1.1~620
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1a32a2a1af515c7adfa96ae58befab310edb342d;p=ceph-ci.git

Merge PR #32970 into master

* refs/pull/32970/head:
	cephadm: include daemon/unit id in unit name

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

1a32a2a1af515c7adfa96ae58befab310edb342d