]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3a0157 b9ce1df)
Merge pull request #7377 from liewegas/wip-datadir-search
authorSage Weil <sage@redhat.com>
Sat, 6 Feb 2016 01:03:50 +0000 (20:03 -0500)
committerSage Weil <sage@redhat.com>
Sat, 6 Feb 2016 01:03:50 +0000 (20:03 -0500)
config: add $data_dir/config to config search path

1  2 
src/ceph_osd.cc patch | diff1 | diff2 | blob | history
src/global/global_init.cc patch | diff1 | diff2 | blob | history

diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/global/global_init.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.