From: athanatos <rexludorum@gmail.com>
Date: Fri, 10 Jan 2014 22:28:01 +0000 (-0800)
Subject: Merge pull request #1074 from ceph/wip-7135
X-Git-Tag: v0.77~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20f8bae920dd980c7f2a47f72005993ed3964679;p=ceph.git

Merge pull request #1074 from ceph/wip-7135

Fixes: #7135

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

20f8bae920dd980c7f2a47f72005993ed3964679