Merge "Align some defaults with with ControllerCount default"
authorJenkins <jenkins@review.openstack.org>
Wed, 11 Nov 2015 02:07:22 +0000 (02:07 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 11 Nov 2015 02:07:22 +0000 (02:07 +0000)

Trivial merge