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

Trivial merge