git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b473a84 9b26052)

author	Sage Weil <sage@redhat.com>
	Tue, 18 Feb 2020 15:29:11 +0000 (09:29 -0600)
committer	Sage Weil <sage@redhat.com>
	Tue, 18 Feb 2020 15:29:11 +0000 (09:29 -0600)
commit	184441a6abf6d0450e11c8715a91d6895b733613
tree	a71d16527a8b141fd77ad21e84781c874b2ea81b	tree \| snapshot
parent	b473a84989763232e3ca585395ce353a558643dd	commit \| diff
parent	9b26052b902c212d632b28db45c5f09cdfa8643d	commit \| diff

Merge PR #33369 into master

* refs/pull/33369/head:
cephadm: check for both chrony service names

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

src/cephadm/cephadm

Unnamed repository; edit this file 'description' to name the repository.