From: Gregory Farnum <greg@gregs42.com>
Date: Mon, 21 Sep 2015 22:50:28 +0000 (-0700)
Subject: Merge pull request #5966 from ukernel/wip-12506
X-Git-Tag: v9.1.0~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76e2e6271cb0ae82cdc3c43ed218d01d39ac7f2c;p=ceph.git

Merge pull request #5966 from ukernel/wip-12506

Wip 12506

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

76e2e6271cb0ae82cdc3c43ed218d01d39ac7f2c