From: John Spray <jspray@redhat.com>
Date: Mon, 17 Oct 2016 12:06:42 +0000 (+0200)
Subject: Merge pull request #11262 from jcsp/wip-17270-master
X-Git-Tag: v11.1.0~622
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=827926421677f2fa06930149e790e87b361147b2;p=ceph.git

Merge pull request #11262 from jcsp/wip-17270-master

Revert "osdc: After write try merge bh."

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

827926421677f2fa06930149e790e87b361147b2