diff options
| author | Sage Weil <sage@redhat.com> | 2019-12-15 02:43:08 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-12-15 02:43:08 +0100 |
| commit | cd780f109c762d99116fc17b77969a19808029af (patch) | |
| tree | 7a74e9b2dcc7943b08bf983f940cfe1eaed007e0 /cmake | |
| parent | Merge PR #32244 into master (diff) | |
| parent | cephadm: fix exception when no time sync is running (diff) | |
| download | ceph-cd780f109c762d99116fc17b77969a19808029af.tar.xz ceph-cd780f109c762d99116fc17b77969a19808029af.zip | |
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>
Diffstat (limited to 'cmake')
0 files changed, 0 insertions, 0 deletions