From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 2 Aug 2013 01:27:34 +0000 (-0700)
Subject: Merge branch 'wip-5831' into next
X-Git-Tag: v0.67~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef036bd4bc0e79bff8a5805800fbdeb0cc2db6ae;p=ceph.git

Merge branch 'wip-5831' into next
---

ef036bd4bc0e79bff8a5805800fbdeb0cc2db6ae