From: Sage Weil <sage@inktank.com>
Date: Tue, 2 Jul 2013 23:55:26 +0000 (-0700)
Subject: Merge branch 'wip-ceph-disk'
X-Git-Tag: v0.67-rc1~164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09e9fef028f3eb27af42ecd704bdfb52cc5ebc89;p=ceph.git

Merge branch 'wip-ceph-disk'

Passed ceph-deploy suite.

Reviewed-by: Dan Mick <dan.mick@inktank.com>
---

09e9fef028f3eb27af42ecd704bdfb52cc5ebc89