]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6980 from dillaman/wip-14063-hammer
authorJosh Durgin <jdurgin@redhat.com>
Sat, 30 Jan 2016 19:44:12 +0000 (11:44 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Sat, 30 Jan 2016 19:44:12 +0000 (11:44 -0800)
librbd: fix merge-diff for >2GB diff-files

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

Trivial merge