]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c0125d 1a44500)
Merge branch 'master' of ceph.newdream.net:/git/ceph
authorGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 8 Sep 2011 16:51:35 +0000 (09:51 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 8 Sep 2011 16:51:35 +0000 (09:51 -0700)
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

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