Merge "Add sahara service support for composable upgrades"
authorJenkins <jenkins@review.openstack.org>
Fri, 20 Jan 2017 15:19:26 +0000 (15:19 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 20 Jan 2017 15:19:26 +0000 (15:19 +0000)

Trivial merge