From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Thu, 1 Dec 2011 19:15:44 +0000 (-0800)
Subject: Merge branch 'wip_local_reads'
X-Git-Tag: v0.40~241
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cce67171a783965e81a7f806d7275a281e7d137a;p=ceph.git

Merge branch 'wip_local_reads'
---

cce67171a783965e81a7f806d7275a281e7d137a