tree 5e3a0c2d17657a3f3c82b3facff8ca70c9b9dd52
parent f1bd2b06abbb8c19ddf939f79b8dc1dcdbd7e71e
parent f6b69e23b95d5348a19774ed14f14b53b52b1452
author Jenkins <jenkins@review.openstack.org> 1494346086 +0000
committer Gerrit Code Review <review@openstack.org> 1494346086 +0000

Merge "Change "admin" literal for admin role to CONF admin_role"