]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6193 from athanatos/wip-13240
authorSamuel Just <sam.just@inktank.com>
Fri, 9 Oct 2015 23:16:27 +0000 (16:16 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 9 Oct 2015 23:16:27 +0000 (16:16 -0700)
ReplicatedPG::maybe_handle_cache: do not promote before checking full

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

Simple merge