]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4253 from majianpeng/scrub-fix2
authorSamuel Just <sam.just@inktank.com>
Thu, 9 Apr 2015 18:16:56 +0000 (11:16 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 9 Apr 2015 18:16:56 +0000 (11:16 -0700)
Scrub bug fix

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge