From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 8 Jan 2012 18:15:41 +0000 (-0800)
Subject: Merge remote branch 'gh/wip-osd-retry-attempt'
X-Git-Tag: v0.40~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5affd6c6c9382bf9cacebcecab3cb98275e23f3;p=ceph.git

Merge remote branch 'gh/wip-osd-retry-attempt'
---

c5affd6c6c9382bf9cacebcecab3cb98275e23f3