From: Sage Weil <sage@newdream.net>
Date: Thu, 15 Jun 2017 21:33:09 +0000 (-0500)
Subject: Merge pull request #15696 from liewegas/wip-19947
X-Git-Tag: v12.1.0~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38b34a783551d81b9aad7a5701df30b4e5fe1e25;p=ceph.git

Merge pull request #15696 from liewegas/wip-19947

osd/PrimaryLogPG: fix oi reset during trim_object
---

38b34a783551d81b9aad7a5701df30b4e5fe1e25