]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-osd-write'
authorSage Weil <sage@newdream.net>
Tue, 21 Feb 2012 22:44:44 +0000 (14:44 -0800)
committerSage Weil <sage@newdream.net>
Tue, 21 Feb 2012 22:44:44 +0000 (14:44 -0800)
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge