Merge "Add Heat profiles"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 May 2016 07:39:02 +0000 (07:39 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 May 2016 07:39:02 +0000 (07:39 +0000)

Trivial merge