]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13136 from liewegas/wip-scrub-waitlist
authorSage Weil <sage@newdream.net>
Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
committerGitHub <noreply@github.com>
Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
osd: use separate waitlist for scrub

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

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