]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6787219 c919080)
Merge PR #32302 into master
authorSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 19:32:24 +0000 (13:32 -0600)
committerSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 19:32:24 +0000 (13:32 -0600)
* refs/pull/32302/head:
cephadm: check for both ntp.service and ntpd.service

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.