Merge "OVS flows apply concurrently using a deferred OVSBridge"

author Jenkins <jenkins@review.openstack.org>

Tue, 5 Aug 2014 23:56:43 +0000 (23:56 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 5 Aug 2014 23:56:43 +0000 (23:56 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 5 Aug 2014 23:56:43 +0000 (23:56 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 5 Aug 2014 23:56:43 +0000 (23:56 +0000)
diff --cc neutron/plugins/ofagent/agent/ofa_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 5 Aug 2014 23:56:43 +0000 (23:56 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 5 Aug 2014 23:56:43 +0000 (23:56 +0000)
		1	2
neutron/plugins/ofagent/agent/ofa_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/ofagent/test_ofa_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history