]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-osd'
authorSage Weil <sage@newdream.net>
Mon, 13 Feb 2012 22:09:04 +0000 (14:09 -0800)
committerSage Weil <sage@newdream.net>
Mon, 13 Feb 2012 22:09:04 +0000 (14:09 -0800)
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge