]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorDan Mick <dan.mick@inktank.com>
Sat, 8 Dec 2012 00:43:24 +0000 (16:43 -0800)
committerDan Mick <dan.mick@inktank.com>
Sat, 8 Dec 2012 00:43:46 +0000 (16:43 -0800)
Merge of wip-rbd-export-progress
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge