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

Merge branch 'wip-5810' into next
---

60679a0a6abf7c098f01f1b3c2d456d8682bf615