]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1344 from ceph/wip-7539
authorSage Weil <sage@inktank.com>
Mon, 3 Mar 2014 05:06:01 +0000 (21:06 -0800)
committerSage Weil <sage@inktank.com>
Mon, 3 Mar 2014 05:06:01 +0000 (21:06 -0800)
Wip 7539

Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge