Merge "Don't use iterator in search for tunnel type"

author Jenkins <jenkins@review.openstack.org>

Fri, 1 May 2015 00:49:33 +0000 (00:49 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 1 May 2015 00:49:33 +0000 (00:49 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 1 May 2015 00:49:33 +0000 (00:49 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 1 May 2015 00:49:33 +0000 (00:49 +0000)
diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 1 May 2015 00:49:33 +0000 (00:49 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 1 May 2015 00:49:33 +0000 (00:49 +0000)
		1	2
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history