From: Gregory Farnum <greg@gregs42.com>
Date: Fri, 21 Aug 2015 11:22:34 +0000 (+0100)
Subject: Merge pull request #5632 from ceph/wip-fix-ftbfs-4998
X-Git-Tag: v9.1.0~328
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2daccff5deb39c99b40244d25f357b12f0d6b852;p=ceph.git

Merge pull request #5632 from ceph/wip-fix-ftbfs-4998

osd: fix the FTBFS introduced by be28319

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

2daccff5deb39c99b40244d25f357b12f0d6b852