]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3536 from athanatos/wip-10616
authorSage Weil <sage@redhat.com>
Thu, 29 Jan 2015 18:18:44 +0000 (10:18 -0800)
committerSage Weil <sage@redhat.com>
Thu, 29 Jan 2015 18:18:44 +0000 (10:18 -0800)
Wip 10616

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

Simple merge