From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 17 May 2012 00:42:21 +0000 (-0700)
Subject: Merge branch 'wip-oc-error-handling' into next
X-Git-Tag: v0.47~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4277d4d3378dde4264e2b8d211371569219c6e4b;p=ceph.git

Merge branch 'wip-oc-error-handling' into next

Reviewed-by: Sage Weil <sage@inktank.com>
---

4277d4d3378dde4264e2b8d211371569219c6e4b