Merge "Remove the ControllerCount contraint"
authorJenkins <jenkins@review.openstack.org>
Thu, 21 Jul 2016 11:14:53 +0000 (11:14 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 21 Jul 2016 11:14:53 +0000 (11:14 +0000)

Trivial merge