]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44d3193 77c780d)
Merge branch 'next'
authorSage Weil <sage@newdream.net>
Mon, 15 Aug 2011 23:34:04 +0000 (16:34 -0700)
committerSage Weil <sage@newdream.net>
Mon, 15 Aug 2011 23:34:04 +0000 (16:34 -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.