]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit29b155de16820e51abcc8a7e6535c9826cd3e938
treee19919f84a9431622de59aeeebb67bbc3dd5da7ftree | snapshot
parent6787219e71983b5cf9654219739050c1df1338c0commit | diff
parentc919080fad9311b131fa696d1b9bcabf445af42fcommit | diff
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>
src/cephadm/cephadm diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.