Merge "Change heat and mistral to use v3/ec2tokens url"
authorJenkins <jenkins@review.openstack.org>
Mon, 3 Apr 2017 10:34:16 +0000 (10:34 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 3 Apr 2017 10:34:16 +0000 (10:34 +0000)

Trivial merge