From: Jason Dillaman Date: Tue, 6 Sep 2016 20:16:37 +0000 (-0400) Subject: Merge pull request #1167 from ceph/wip-17222-jewel X-Git-Tag: v10.2.6~165^2^2~40 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa1600ece8457b4ce9789b51cc135ee6163b4816;p=ceph.git Merge pull request #1167 from ceph/wip-17222-jewel Backport krbd/unmap fixes Reviewed-by: Jason Dillaman --- aa1600ece8457b4ce9789b51cc135ee6163b4816