]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31437 into master
authorSage Weil <sage@redhat.com>
Wed, 6 Nov 2019 17:30:29 +0000 (11:30 -0600)
committerSage Weil <sage@redhat.com>
Wed, 6 Nov 2019 17:30:29 +0000 (11:30 -0600)
* refs/pull/31437/head:
ceph-daemon: Remove data dir during adopt

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/ceph-daemon

diff --cc src/ceph-daemon
Simple merge