Merge "ovs, ofagent: Remove dead code"

author Jenkins <jenkins@review.openstack.org>

Mon, 9 Jun 2014 04:28:17 +0000 (04:28 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 9 Jun 2014 04:28:17 +0000 (04:28 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 9 Jun 2014 04:28:17 +0000 (04:28 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 9 Jun 2014 04:28:17 +0000 (04:28 +0000)
diff --cc neutron/plugins/ofagent/agent/ofa_neutron_agent.py
Simple merge
diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 9 Jun 2014 04:28:17 +0000 (04:28 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 9 Jun 2014 04:28:17 +0000 (04:28 +0000)
		1	2
neutron/plugins/ofagent/agent/ofa_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history