Merge "net-config-multinode: make controlplane int idempotent"
authorJenkins <jenkins@review.openstack.org>
Fri, 3 Feb 2017 18:33:46 +0000 (18:33 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Feb 2017 18:33:46 +0000 (18:33 +0000)

Trivial merge