Merge "Composable firewall rules"
authorJenkins <jenkins@review.openstack.org>
Mon, 25 Jul 2016 21:08:06 +0000 (21:08 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 25 Jul 2016 21:08:06 +0000 (21:08 +0000)

Trivial merge