From: John Spray <jspray@redhat.com>
Date: Tue, 2 Aug 2016 11:31:18 +0000 (+0100)
Subject: Merge pull request #10453 from ajarr/wip-manila-backports-jewel
X-Git-Tag: v10.2.3~113
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=269d7427dfa9de7b1a288da0532505810bdf283b;p=ceph.git

Merge pull request #10453 from ajarr/wip-manila-backports-jewel

jewel: essential backports for OpenStack Manila

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

269d7427dfa9de7b1a288da0532505810bdf283b