]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6981 from dillaman/wip-14062-infernalis
authorLoic Dachary <loic@dachary.org>
Thu, 11 Feb 2016 15:32:25 +0000 (22:32 +0700)
committerLoic Dachary <loic@dachary.org>
Thu, 11 Feb 2016 15:32:25 +0000 (22:32 +0700)
librbd: fix merge-diff for >2GB diff-files

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

Trivial merge