Merge "N->O upgrade, blanks ipv6 rules before activating it." into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 30 Mar 2017 11:06:25 +0000 (11:06 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 30 Mar 2017 11:06:25 +0000 (11:06 +0000)

Trivial merge