From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 5 Feb 2015 10:13:00 +0000 (+0000)
Subject: Merge "Not assign dynamic IPv6 address on dhcp interface"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e9314c97eb3ece18cdbb6fc63e42b9931bfe6ad0;p=openstack-build%2Fneutron-build.git

Merge "Not assign dynamic IPv6 address on dhcp interface"
---

e9314c97eb3ece18cdbb6fc63e42b9931bfe6ad0
diff --cc neutron/agent/linux/dhcp.py
index fa4fb853b,472d7fd33..26284ef7b
--- a/neutron/agent/linux/dhcp.py
+++ b/neutron/agent/linux/dhcp.py
@@@ -30,8 -30,9 +30,9 @@@ from neutron.agent.linux import ip_li
  from neutron.agent.linux import utils
  from neutron.common import constants
  from neutron.common import exceptions
+ from neutron.common import ipv6_utils
  from neutron.common import utils as commonutils
 -from neutron.i18n import _LE
 +from neutron.i18n import _LE, _LI
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import uuidutils