From: Sage Weil <sage@inktank.com>
Date: Thu, 25 Apr 2013 17:21:11 +0000 (-0700)
Subject: Merge branch 'wip-4748-b' into next
X-Git-Tag: v0.61~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea54e6603f9c322d38f9f664dee92997b8a4bd4f;p=ceph.git

Merge branch 'wip-4748-b' into next

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

ea54e6603f9c322d38f9f664dee92997b8a4bd4f