From: athanatos <sam.just@inktank.com>
Date: Mon, 13 Jan 2014 22:25:51 +0000 (-0800)
Subject: Merge pull request #931 from ceph/wip-5858-rebase
X-Git-Tag: v0.77~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=196e3d62780554e5e21994d2cee0af9a7c873f07;p=ceph.git

Merge pull request #931 from ceph/wip-5858-rebase

Wip 5858 rebase

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

196e3d62780554e5e21994d2cee0af9a7c873f07