From: Sage Weil <sage@inktank.com>
Date: Tue, 16 Jul 2013 22:52:37 +0000 (-0700)
Subject: Merge branch 'wip-ceph-disk' into next
X-Git-Tag: v0.67-rc1~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ec26b8e7b67db89da17696e57e0b634fceb93aa;p=ceph.git

Merge branch 'wip-ceph-disk' into next

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
Tested-by: Jing Yuan Luke <jyluke@gmail.com>
---

1ec26b8e7b67db89da17696e57e0b634fceb93aa