From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 28 Jun 2017 19:32:04 +0000 (-0700)
Subject: Merge pull request #15635 from dzafman/wip-13837
X-Git-Tag: v12.1.2~1^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27569da06ed3f2ac77a8b1cd724542720ba7ca70;p=ceph.git

Merge pull request #15635 from dzafman/wip-13837

osd: Corrupt objects stop snaptrim and mark pg snaptrim_error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

27569da06ed3f2ac77a8b1cd724542720ba7ca70