From: Nathan Cutler Date: Mon, 30 Jan 2017 12:25:48 +0000 (+0100) Subject: Merge pull request #12649 from xiaoxichen/wip-18278-jewel X-Git-Tag: v10.2.6~130 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efad365753b7847ecce1280fe267d97d2ccf2888;p=ceph.git Merge pull request #12649 from xiaoxichen/wip-18278-jewel jewel: rbd: librbd: use proper snapshot when computing diff parent overlap Reviewed-by: Jason Dillaman --- efad365753b7847ecce1280fe267d97d2ccf2888