Merge "Add ARP spoofing protection for LinuxBridge agent"

author Jenkins <jenkins@review.openstack.org>

Wed, 8 Jul 2015 20:40:08 +0000 (20:40 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 8 Jul 2015 20:40:08 +0000 (20:40 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 8 Jul 2015 20:40:08 +0000 (20:40 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 8 Jul 2015 20:40:08 +0000 (20:40 +0000)
diff --cc neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
Simple merge
diff --cc neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 8 Jul 2015 20:40:08 +0000 (20:40 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 8 Jul 2015 20:40:08 +0000 (20:40 +0000)
		1	2
neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history