Merge "Always fill UDP checksums in DHCP replies"

diff --cc neutron/agent/linux/dhcp.py
index 99b42099b7d89cae51d4bb493b56ce8fbff55bdc,457d9190880ffef1dc298c6fdb76deac9a03a53b..0e30f7046184d7e9ce27a215c840f80e553f842f
--- 1/neutron/agent/linux/dhcp.py
--- 2/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

diff --cc neutron/tests/unit/test_dhcp_agent.py
Simple merge