]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6d7629 f033467)
Merge remote branch 'gh/wip-stuck-in-backfill'
authorSage Weil <sage.weil@dreamhost.com>
Thu, 9 Feb 2012 04:43:53 +0000 (20:43 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Thu, 9 Feb 2012 04:43:53 +0000 (20:43 -0800)
Reviewed-by: Sage Weil <sage.weil@dreamhost.com>
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.