]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3910 from athanatos/wip-11027
authorSamuel Just <sam.just@inktank.com>
Tue, 17 Mar 2015 17:28:56 +0000 (10:28 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 17 Mar 2015 17:28:56 +0000 (10:28 -0700)
Wip 11027

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

Simple merge