From: John Spray <jspray@redhat.com>
Date: Fri, 3 Jun 2016 11:37:00 +0000 (+0100)
Subject: Merge pull request #9430 from ceph/wip-manila-backports
X-Git-Tag: v10.2.2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1c4c4c456d1d20ccc91de4f762dbe46d8e339a3;p=ceph.git

Merge pull request #9430 from ceph/wip-manila-backports

jewel: backports needed for Manila

Reviewed-by: John Spray <john.spray@redhat.com>
---

b1c4c4c456d1d20ccc91de4f762dbe46d8e339a3