From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 12 May 2011 00:57:07 +0000 (-0700)
Subject: Merge branch 'osd_pgls'
X-Git-Tag: v0.29~124
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2655a2b5db0ad4de0b79f4b646380e9d212a91be;p=ceph.git

Merge branch 'osd_pgls'
---

2655a2b5db0ad4de0b79f4b646380e9d212a91be