From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 1 Aug 2013 06:01:03 +0000 (-0700)
Subject: Merge branch 'wip-5815' into next
X-Git-Tag: v0.67~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbd558ada5e99d0aeb7bd8d850cbb4218643eb97;p=ceph.git

Merge branch 'wip-5815' into next

Reviewed-by: Sage Weil <sage@inktank.com>
---

bbd558ada5e99d0aeb7bd8d850cbb4218643eb97