Merge "Add mistral service support for composable upgrades" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Mar 2017 20:05:26 +0000 (20:05 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Mar 2017 20:05:26 +0000 (20:05 +0000)

Trivial merge