From: Sage Weil <sage@inktank.com>
Date: Thu, 27 Sep 2012 20:33:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-osd'
X-Git-Tag: v0.53~28
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aae9214c80c6f8f083681e982f209717df9f0266;p=ceph.git

Merge remote-tracking branch 'gh/wip-osd'

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

aae9214c80c6f8f083681e982f209717df9f0266