]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72c63fe aadeaba)
Merge PR #31487 into master
authorSage Weil <sage@redhat.com>
Tue, 12 Nov 2019 15:42:03 +0000 (09:42 -0600)
committerSage Weil <sage@redhat.com>
Tue, 12 Nov 2019 15:42:03 +0000 (09:42 -0600)
* refs/pull/31487/head:
ceph-daemon: add `--base-dir` arg to `adopt` command

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/ceph-daemon/ceph-daemon patch | diff1 | diff2 | blob | history

diff --cc src/ceph-daemon/ceph-daemon
Simple merge
Unnamed repository; edit this file 'description' to name the repository.