]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8462 from xiexingguo/xxg-wip-scrub
authorSage Weil <sage@redhat.com>
Sat, 9 Apr 2016 17:38:20 +0000 (13:38 -0400)
committerSage Weil <sage@redhat.com>
Sat, 9 Apr 2016 17:38:20 +0000 (13:38 -0400)
osd: fix two scrub relevant issues

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge