]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit2e4fa4b3bd35f9d492d94929ff70d5793ba6193e
tree6ef04d1be330d007f96e0f93fbc639abf70145c3
parentf3a0157587719e4e35c66f50b658d15c73bda9de
parentb9ce1df075b60b3f1ca3ae4b3ff4f431fa570649
Merge pull request #7377 from liewegas/wip-datadir-search

config: add $data_dir/config to config search path
src/ceph_osd.cc
src/global/global_init.cc