From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 30 Jan 2016 19:44:12 +0000 (-0800)
Subject: Merge pull request #6980 from dillaman/wip-14063-hammer
X-Git-Tag: v0.94.6~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23c24fc50d07a07db12239ac372bfce5a9fe2255;p=ceph.git

Merge pull request #6980 from dillaman/wip-14063-hammer

librbd: fix merge-diff for >2GB diff-files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

23c24fc50d07a07db12239ac372bfce5a9fe2255