From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 30 Jan 2018 23:17:10 +0000 (-0800)
Subject: Merge PR #20113 into master
X-Git-Tag: v13.0.2~408
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae0b89c6c9712f7332681817695ed7aa8fdf99bc;p=ceph.git

Merge PR #20113 into master

* refs/pull/20113/head:
	osdc/ObjectCacher: don't merge TX buffer heads
	osdc/ObjectCacher: fix off-by-one error in bh_write_commit()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

ae0b89c6c9712f7332681817695ed7aa8fdf99bc