]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-oc-error-handling' into next
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 17 May 2012 00:42:21 +0000 (17:42 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 17 May 2012 00:42:56 +0000 (17:42 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge