From: Sage Weil <sage@inktank.com>
Date: Wed, 23 May 2012 23:42:49 +0000 (-0700)
Subject: Merge branch 'osd-mkfs'
X-Git-Tag: v0.48argonaut~151^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9453413c49ed3ef1c403bf831115f89eda44cbfc;p=ceph.git

Merge branch 'osd-mkfs'

Reviewed-by: Sam Just <sam.just@inktank.com>
---

9453413c49ed3ef1c403bf831115f89eda44cbfc