]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12649 from xiaoxichen/wip-18278-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Mon, 30 Jan 2017 12:25:48 +0000 (13:25 +0100)
committerGitHub <noreply@github.com>
Mon, 30 Jan 2017 12:25:48 +0000 (13:25 +0100)
jewel: rbd: librbd: use proper snapshot when computing diff parent overlap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/librbd/DiffIterate.cc

Simple merge