]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rbd-import' into next
authorJosh Durgin <josh.durgin@inktank.com>
Sat, 16 Mar 2013 22:45:18 +0000 (15:45 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Sat, 16 Mar 2013 22:45:58 +0000 (15:45 -0700)
Reviewed-by: Sage Weil <sage.weil@inktank.com>

Trivial merge