From: Sage Weil <sage@redhat.com>
Date: Sun, 15 Dec 2019 01:43:08 +0000 (-0600)
Subject: Merge PR #32158 into master
X-Git-Tag: v15.1.0~498
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd780f109c762d99116fc17b77969a19808029af;p=ceph-ci.git

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>
---

cd780f109c762d99116fc17b77969a19808029af