Merge "Allow ctlplane network or ID, and default to "ctlplane""
authorJenkins <jenkins@review.openstack.org>
Tue, 20 Oct 2015 21:38:03 +0000 (21:38 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 20 Oct 2015 21:38:03 +0000 (21:38 +0000)

Trivial merge