]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #32158 into master
authorSage Weil <sage@redhat.com>
Sun, 15 Dec 2019 01:43:08 +0000 (19:43 -0600)
committerSage Weil <sage@redhat.com>
Sun, 15 Dec 2019 01:43:08 +0000 (19:43 -0600)
* refs/pull/32158/head:
cephadm: fix exception when no time sync is running
cephadm: properly extract osd fsid during adoption
cephadm: do ceph-volume activate+deactivate as part of systemd unit
ceph-daemon: behave with no /etc/ceph/ceph.conf

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

Trivial merge