From: Noah Watkins <noahwatkins@gmail.com>
Date: Tue, 8 Jan 2013 00:14:16 +0000 (-0800)
Subject: Merge branch 'wip-stripe-gran'
X-Git-Tag: v0.57~239
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b194b2564232266d066e5ea8be60c557b9fabdf;p=ceph.git

Merge branch 'wip-stripe-gran'

Reviewed-by: Greg Farnum <greg@inktank.com>
---

1b194b2564232266d066e5ea8be60c557b9fabdf