Merge "Add missing ec2api::api::keystone_ec2_tokens_url config" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Sat, 8 Apr 2017 06:15:47 +0000 (06:15 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 8 Apr 2017 06:15:47 +0000 (06:15 +0000)

Trivial merge