From: David Zafman <dzafman@redhat.com>
Date: Wed, 1 Aug 2018 15:51:12 +0000 (-0400)
Subject: Merge pull request #23236 from dzafman/wip-25085-luminous
X-Git-Tag: v12.2.8~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a47c989123d201fd37411f52f6db0459958581a;p=ceph.git

Merge pull request #23236 from dzafman/wip-25085-luminous

luminous: Fix  25085 and 24949

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

2a47c989123d201fd37411f52f6db0459958581a