From: Josh Durgin <josh.durgin@inktank.com>
Date: Sat, 16 Mar 2013 22:45:18 +0000 (-0700)
Subject: Merge branch 'wip-rbd-import' into next
X-Git-Tag: v0.59~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35ab2a4189103abc25035a489a74b8261e9317c2;p=ceph.git

Merge branch 'wip-rbd-import' into next

Reviewed-by: Sage Weil <sage.weil@inktank.com>
---

35ab2a4189103abc25035a489a74b8261e9317c2