]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d915c8 3cbca1d)
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)
commitcd780f109c762d99116fc17b77969a19808029af
tree7a74e9b2dcc7943b08bf983f940cfe1eaed007e0tree | snapshot
parent2d915c8d0e2a61fabb02f660fef51346084b1bc7commit | diff
parent3cbca1dce81f72d3d4c983d40e442ea1cd028562commit | diff
Merge PR #32158 into master

* 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>
Unnamed repository; edit this file 'description' to name the repository.