From: Loic Dachary <loic@dachary.org>
Date: Thu, 12 May 2016 15:30:14 +0000 (+0200)
Subject: Merge pull request #8853 from ceph/wip-jewel-backports
X-Git-Tag: v10.2.1~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d93a90ec2743c9aec229891c3b0da72b038cffad;p=ceph.git

Merge pull request #8853 from ceph/wip-jewel-backports

jewel: several backports

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

d93a90ec2743c9aec229891c3b0da72b038cffad