Merge "Fix OVS agent reclaims local VLAN"

author Jenkins <jenkins@review.openstack.org>

Fri, 22 Nov 2013 09:55:46 +0000 (09:55 +0000)

committer Gerrit Code Review <review@openstack.org>

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