]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-da-SCA-20140218' into firefly
authorJosh Durgin <josh.durgin@inktank.com>
Sat, 22 Feb 2014 01:40:30 +0000 (17:40 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Sat, 22 Feb 2014 01:40:30 +0000 (17:40 -0800)
commit72820a84674477464496fc13961316192bc5383b
tree468c23971937f304fbdb0b2774d6070a6b975aa6
parentd9bedb9ebeed3e1ee6056dab166c08b19e54bb53
parent9e8882e06cb5376adfdf3aa4666d07435a5bb65a
Merge remote-tracking branch 'origin/wip-da-SCA-20140218' into firefly

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
src/osd/OSD.cc
src/osd/PG.cc
src/osd/ReplicatedPG.cc
src/rgw/rgw_rados.cc