]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/rep_scrub_wq' into stable
authorSage Weil <sage.weil@dreamhost.com>
Wed, 9 Feb 2011 00:22:01 +0000 (16:22 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 9 Feb 2011 00:22:01 +0000 (16:22 -0800)
1  2 
src/osd/OSD.cc
src/osd/PG.cc

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge