Merge "Updated the heat_template_version"
authorJenkins <jenkins@review.openstack.org>
Thu, 10 Mar 2016 11:19:00 +0000 (11:19 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 10 Mar 2016 11:19:00 +0000 (11:19 +0000)

Trivial merge