From: Sage Weil <sage@inktank.com>
Date: Mon, 30 Jul 2012 17:49:44 +0000 (-0700)
Subject: Merge branch 'wip-osd'
X-Git-Tag: v0.51~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=480380025bcc7f9e6e6bd7c1b90815d6fb6ed9ce;p=ceph.git

Merge branch 'wip-osd'

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

480380025bcc7f9e6e6bd7c1b90815d6fb6ed9ce