]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 548f329 2a266bd)
Merge remote branch 'origin/ostimeo'
authorSage Weil <sage.weil@dreamhost.com>
Tue, 1 Feb 2011 00:24:12 +0000 (16:24 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Tue, 1 Feb 2011 00:24:12 +0000 (16:24 -0800)
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.