]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitec9d14c1befe21b45c28efb9c91f240ac7c6be51
treecc562f52e82ef28bbd1782bc189bb7dca63b9d4e
parent36097c3ac50883d28d4f00f0a2147867384d7e33
parentcc525b3a3e19c3239d9c3c5118e61ab22f89df1f
Merge remote branch 'origin/rep_scrub_wq' into stable
src/osd/OSD.cc
src/osd/PG.cc