From: Sage Weil <sage@inktank.com>
Date: Fri, 25 Oct 2013 19:56:02 +0000 (-0700)
Subject: Merge branch 'wip-osd-fixes' into next
X-Git-Tag: v0.72-rc1~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f7114a94562a9bf54e9c0e81e7ac1325fdb13b8;p=ceph.git

Merge branch 'wip-osd-fixes' into next

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

4f7114a94562a9bf54e9c0e81e7ac1325fdb13b8