Merge "configure Heat with new authtoken parameters"
authorJenkins <jenkins@review.openstack.org>
Wed, 31 Aug 2016 01:47:51 +0000 (01:47 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 31 Aug 2016 01:47:51 +0000 (01:47 +0000)

Trivial merge