From: Sage Weil <sage@redhat.com>
Date: Sat, 9 Apr 2016 17:38:20 +0000 (-0400)
Subject: Merge pull request #8462 from xiexingguo/xxg-wip-scrub
X-Git-Tag: v10.1.2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55aeba24b39721848ff94fbd4412ceb82ce63179;p=ceph.git

Merge pull request #8462 from xiexingguo/xxg-wip-scrub

osd: fix two scrub relevant issues

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

55aeba24b39721848ff94fbd4412ceb82ce63179