From: Josh Durgin <josh.durgin@inktank.com>
Date: Mon, 10 Feb 2014 21:49:23 +0000 (-0800)
Subject: Merge branch wip-librados-timeout
X-Git-Tag: v0.78~206
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32aa9fdf666063e4c5539b5e850f04af37e30b2e;p=ceph.git

Merge branch wip-librados-timeout

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
---

32aa9fdf666063e4c5539b5e850f04af37e30b2e