]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1834 from ceph/wip-8334
authorSage Weil <sage@inktank.com>
Wed, 21 May 2014 20:19:54 +0000 (13:19 -0700)
committerSage Weil <sage@inktank.com>
Wed, 21 May 2014 20:19:54 +0000 (13:19 -0700)
Wip 8334

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

Simple merge