From: Sage Weil <sage@redhat.com>
Date: Wed, 24 Feb 2016 19:35:38 +0000 (-0800)
Subject: Merge pull request #7051 from wonzhq/scrub-cmp-map
X-Git-Tag: v10.1.0~305
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f053e3e7f0eb5bfd10b59141ab0afa6d082d933c;p=ceph.git

Merge pull request #7051 from wonzhq/scrub-cmp-map

osd: avoid FORCE updating digest been overwritten by MAYBE when comparing scrub map

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

f053e3e7f0eb5bfd10b59141ab0afa6d082d933c