From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 18 Feb 2016 14:41:23 +0000 (-0800)
Subject: Merge branch 'greg-pr-7034'
X-Git-Tag: v10.1.0~366
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf24e351d92f91adaa1392c467f6a95ae89596d1;p=ceph.git

Merge branch 'greg-pr-7034'
---

bf24e351d92f91adaa1392c467f6a95ae89596d1