]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1417 from ceph/wip-7663
authorSage Weil <sage@inktank.com>
Tue, 11 Mar 2014 23:38:28 +0000 (16:38 -0700)
committerSage Weil <sage@inktank.com>
Tue, 11 Mar 2014 23:38:28 +0000 (16:38 -0700)
Wip 7663

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

Simple merge