Merge "Don't assume default network names in net_ip*map" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Mon, 27 Feb 2017 13:26:23 +0000 (13:26 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 27 Feb 2017 13:26:23 +0000 (13:26 +0000)

Trivial merge