From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 28 Nov 2012 21:56:27 +0000 (-0800)
Subject: Merge branch 'wip-3532-2'
X-Git-Tag: v0.56~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a36ac5bd6f4e3d2ec425a35f8ae9ffa20df138c;p=ceph.git

Merge branch 'wip-3532-2'
---

6a36ac5bd6f4e3d2ec425a35f8ae9ffa20df138c