]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 679cd1f 0b1e3ed)
Merge branch 'master' of ssh://github.com/ceph/ceph
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 27 Mar 2012 22:35:38 +0000 (15:35 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 27 Mar 2012 22:35:38 +0000 (15:35 -0700)
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.