From: Sage Weil <sage@newdream.net>
Date: Thu, 23 Feb 2012 19:16:17 +0000 (-0800)
Subject: Merge branch 'wip-2090'
X-Git-Tag: v0.43~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=963dec82880717054c760a745cf93cc7b43112df;p=ceph.git

Merge branch 'wip-2090'

Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

963dec82880717054c760a745cf93cc7b43112df