From: David Zafman <david.zafman@inktank.com>
Date: Fri, 31 Jan 2014 20:35:56 +0000 (-0800)
Subject: Merge pull request #1162 from ceph/wip-5997
X-Git-Tag: v0.78~237
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dffe6019c3698ca1661c94984df9629241c3e1ef;p=ceph.git

Merge pull request #1162 from ceph/wip-5997

Fixes: #5997

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

dffe6019c3698ca1661c94984df9629241c3e1ef