Merge "Add ironic service support for composable upgrades"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 Jan 2017 13:33:26 +0000 (13:33 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 Jan 2017 13:33:26 +0000 (13:33 +0000)

Trivial merge