From: Josh Durgin Date: Tue, 5 Jan 2016 19:39:12 +0000 (-0800) Subject: Merge branch 'wip-14237-jewel' of git://github.com/dillaman/ceph into jewel X-Git-Tag: v10.0.2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb680a3a6ba77a3c1b203b1dbb31fcdb94122991;p=ceph.git Merge branch 'wip-14237-jewel' of git://github.com/dillaman/ceph into jewel qa/workunits/rbd: import_export should use clean temp space Reviewed-by: Josh Durgin --- eb680a3a6ba77a3c1b203b1dbb31fcdb94122991