Merge "manila: set "neutron_admin_auth_url" correctly" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Wed, 6 Sep 2017 06:34:36 +0000 (06:34 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 6 Sep 2017 06:34:36 +0000 (06:34 +0000)

Trivial merge