]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1441 from ceph/wip-7671
authorSage Weil <sage@inktank.com>
Thu, 13 Mar 2014 00:09:31 +0000 (17:09 -0700)
committerSage Weil <sage@inktank.com>
Thu, 13 Mar 2014 00:09:31 +0000 (17:09 -0700)
Wip 7671

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

Simple merge