]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6364 from dillaman/wip-13491
authorSage Weil <sage@redhat.com>
Mon, 9 Nov 2015 14:03:41 +0000 (09:03 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Nov 2015 14:03:41 +0000 (09:03 -0500)
osd: fix broken balance / localized read handling

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/PG.cc
src/osd/ReplicatedPG.cc

diff --cc src/osd/PG.cc
Simple merge
Simple merge