From: Samuel Just <sam.just@inktank.com>
Date: Thu, 6 Jun 2013 16:21:46 +0000 (-0700)
Subject: Merge branch 'wip_5154'
X-Git-Tag: v0.65~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=595962aa8995c4fbfb50dacc0ff33315f37cb5a8;p=ceph.git

Merge branch 'wip_5154'

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

595962aa8995c4fbfb50dacc0ff33315f37cb5a8