]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7349bce fb6454f)
Merge branch 'unstable' into msgr
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 13 Sep 2010 19:14:51 +0000 (12:14 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Mon, 13 Sep 2010 19:14:51 +0000 (12:14 -0700)
1  2 
src/config.cc patch | diff1 | diff2 | blob | history

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