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

Trivial merge