Merge "Add zaqar service for composable upgrade" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Mar 2017 16:41:50 +0000 (16:41 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Mar 2017 16:41:51 +0000 (16:41 +0000)

Trivial merge