From: Nathan Cutler <presnypreklad@gmail.com>
Date: Thu, 23 Mar 2017 15:49:13 +0000 (+0100)
Subject: Merge pull request #14100 from smithfarm/wip-18781
X-Git-Tag: v10.2.7~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d222b943217a2ec022678e50b34766d231004ce;p=ceph.git

Merge pull request #14100 from smithfarm/wip-18781

Manually merge PR#13143 which was mistakenly merged to jewel-next

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

9d222b943217a2ec022678e50b34766d231004ce