Merge "Composable HA"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 Jan 2017 23:04:41 +0000 (23:04 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 Jan 2017 23:04:41 +0000 (23:04 +0000)

Trivial merge