]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15696 from liewegas/wip-19947
authorSage Weil <sage@newdream.net>
Thu, 15 Jun 2017 21:33:09 +0000 (16:33 -0500)
committerGitHub <noreply@github.com>
Thu, 15 Jun 2017 21:33:09 +0000 (16:33 -0500)
osd/PrimaryLogPG: fix oi reset during trim_object


Trivial merge