]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1505 from ceph/wip-7728
authorSamuel Just <sam.just@inktank.com>
Thu, 20 Mar 2014 21:05:47 +0000 (14:05 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 20 Mar 2014 21:05:47 +0000 (14:05 -0700)
Wip 7728

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

Simple merge