Merge "Revert "Change function call order in ovs_neutron_agent.""

author Jenkins <jenkins@review.openstack.org>

Sat, 16 Jan 2016 13:41:09 +0000 (13:41 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 16 Jan 2016 13:41:10 +0000 (13:41 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 16 Jan 2016 13:41:09 +0000 (13:41 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 16 Jan 2016 13:41:10 +0000 (13:41 +0000)
diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 16 Jan 2016 13:41:09 +0000 (13:41 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 16 Jan 2016 13:41:10 +0000 (13:41 +0000)
		1	2
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history