From: Sage Weil <sage@newdream.net>
Date: Wed, 25 Jan 2012 05:19:44 +0000 (-0800)
Subject: Merge remote branch 'gh/wip-filestore-errors'
X-Git-Tag: v0.41~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abc005a5df29446bf309d80dbe8019482606b2c0;p=ceph.git

Merge remote branch 'gh/wip-filestore-errors'
---

abc005a5df29446bf309d80dbe8019482606b2c0