From: John Spray <jspray@redhat.com>
Date: Fri, 11 Nov 2016 11:06:53 +0000 (+0100)
Subject: Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug
X-Git-Tag: v11.1.0~340
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff9b388f15b26f52857da01615e357568d21b934;p=ceph.git

Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug

osdc: After write try merge bh.

Reviewed-by: John Spray <john.spray@redhat.com>
---

ff9b388f15b26f52857da01615e357568d21b934