Merge "Updates ControlPlaneSubnetCidr to be a string"
authorJenkins <jenkins@review.openstack.org>
Tue, 3 May 2016 12:12:54 +0000 (12:12 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 3 May 2016 12:12:54 +0000 (12:12 +0000)

Trivial merge