Merge "Add heat service support for composable upgrades"
authorJenkins <jenkins@review.openstack.org>
Mon, 16 Jan 2017 15:54:07 +0000 (15:54 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 16 Jan 2017 15:54:07 +0000 (15:54 +0000)

Trivial merge