]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b76f9f 2b3bdea)
Merge branch 'stable'
authorSage Weil <sage.weil@dreamhost.com>
Thu, 20 Oct 2011 21:12:40 +0000 (14:12 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Thu, 20 Oct 2011 21:12:40 +0000 (14:12 -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.