]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6889 from kylinstorage/wip-fix-merge-diff
authorJosh Durgin <jdurgin@redhat.com>
Thu, 10 Dec 2015 19:18:31 +0000 (11:18 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 10 Dec 2015 19:18:31 +0000 (11:18 -0800)
librbd: fix merge-diff for >2GB diff-files

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

Trivial merge