]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1169 from dachary/wip-ceph-disk
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 31 Jan 2014 00:04:09 +0000 (16:04 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 31 Jan 2014 00:04:09 +0000 (16:04 -0800)
Reviewed-by: Sage Weil <sage.weil@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge