From: David Zafman <david.zafman@inktank.com>
Date: Thu, 1 Aug 2013 04:24:28 +0000 (-0700)
Subject: Merge branch 'wip-5784' into next
X-Git-Tag: v0.67~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=317d6982354e2d8368a2bf752dd6df59f95d3975;p=ceph.git

Merge branch 'wip-5784' into next

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

317d6982354e2d8368a2bf752dd6df59f95d3975