]> 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: 280a94b fe30ac6)
Merge pull request #766 from kri5/wip-5374
authorYehuda Sadeh <yehuda@inktank.com>
Wed, 30 Oct 2013 23:56:46 +0000 (16:56 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Wed, 30 Oct 2013 23:56:46 +0000 (16:56 -0700)
Rebase of Wip 5374 against master

Reviewed-by: Yehuda Sadeh <yehdua@inktank.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.