]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #31831 into master
authorSage Weil <sage@redhat.com>
Sun, 24 Nov 2019 02:26:08 +0000 (20:26 -0600)
committerSage Weil <sage@redhat.com>
Sun, 24 Nov 2019 02:26:08 +0000 (20:26 -0600)
* refs/pull/31831/head:
ceph-daemon: make infer_fsid behave when /var/lib/ceph dne

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/ceph-daemon/ceph-daemon

Simple merge