Merge "Next generation HA architecture work"
authorJenkins <jenkins@review.openstack.org>
Thu, 4 Aug 2016 23:57:07 +0000 (23:57 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 4 Aug 2016 23:57:07 +0000 (23:57 +0000)

Trivial merge