]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13146 from dzafman/wip-18502-jewel-zafman
authorDavid Zafman <dzafman@redhat.com>
Fri, 24 Mar 2017 15:13:02 +0000 (08:13 -0700)
committerGitHub <noreply@github.com>
Fri, 24 Mar 2017 15:13:02 +0000 (08:13 -0700)
jewel: osd: Scrub improvements and other fixes

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

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