Merge "heat: port_security_enabled, allowed_address_pairs, disable gateway_ip"
authorRoss Brattain <ross.b.brattain@intel.com>
Fri, 21 Jul 2017 22:06:05 +0000 (22:06 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 21 Jul 2017 22:06:05 +0000 (22:06 +0000)

Trivial merge