From: Josh Durgin Date: Mon, 16 Feb 2015 22:27:44 +0000 (-0800) Subject: Merge branch 'wip-librbd-snaps-object-map' into hammer X-Git-Tag: v0.93~38^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac75ff3c2bc7d694b4a054fe79085623bcd9d930;p=ceph.git Merge branch 'wip-librbd-snaps-object-map' into hammer Reviewed-by: Josh Durgin --- ac75ff3c2bc7d694b4a054fe79085623bcd9d930