From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 31 Jan 2014 00:04:09 +0000 (-0800)
Subject: Merge pull request #1169 from dachary/wip-ceph-disk
X-Git-Tag: v0.76~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=abcc17bf3f48672985a1635fe6e4d02bc3fac17d;p=ceph.git

Merge pull request #1169 from dachary/wip-ceph-disk

Reviewed-by: Sage Weil <sage.weil@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

abcc17bf3f48672985a1635fe6e4d02bc3fac17d