From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 20 Mar 2015 21:24:16 +0000 (+0000)
Subject: Merge "Always fill UDP checksums in DHCP replies"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7620159c78966c6b1df8f7aac7cfa44c1aea1c76;p=openstack-build%2Fneutron-build.git

Merge "Always fill UDP checksums in DHCP replies"
---

7620159c78966c6b1df8f7aac7cfa44c1aea1c76
diff --cc neutron/agent/linux/dhcp.py
index 99b42099b,457d91908..0e30f7046
--- a/neutron/agent/linux/dhcp.py
+++ b/neutron/agent/linux/dhcp.py
@@@ -25,8 -23,8 +25,9 @@@ from oslo_log import log as loggin
  from oslo_utils import importutils
  import six
  
 +from neutron.agent.linux import external_process
  from neutron.agent.linux import ip_lib
+ from neutron.agent.linux import iptables_manager
  from neutron.agent.linux import utils
  from neutron.common import constants
  from neutron.common import exceptions