From: Loic Dachary <loic@dachary.org>
Date: Thu, 11 Feb 2016 15:32:25 +0000 (+0700)
Subject: Merge pull request #6981 from dillaman/wip-14062-infernalis
X-Git-Tag: v9.2.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5e33cd348532b4ed911f49240a5da0c6859a9ad;p=ceph.git

Merge pull request #6981 from dillaman/wip-14062-infernalis

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

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

f5e33cd348532b4ed911f49240a5da0c6859a9ad