From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 19:32:24 +0000 (-0600)
Subject: Merge PR #32302 into master
X-Git-Tag: v15.1.0~453
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29b155de16820e51abcc8a7e6535c9826cd3e938;p=ceph.git

Merge PR #32302 into master

* refs/pull/32302/head:
	cephadm: check for both ntp.service and ntpd.service

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

29b155de16820e51abcc8a7e6535c9826cd3e938