]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip_4257'
authorSage Weil <sage@inktank.com>
Tue, 26 Feb 2013 20:25:43 +0000 (12:25 -0800)
committerSage Weil <sage@inktank.com>
Tue, 26 Feb 2013 20:25:43 +0000 (12:25 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge