]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6119 from athanatos/wip-13192
authorSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 00:32:47 +0000 (20:32 -0400)
committerSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 00:32:47 +0000 (20:32 -0400)
Wip 13192

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

Simple merge