Merge "ofagent: Add a missing push_vlan action"

author Jenkins <jenkins@review.openstack.org>

Wed, 4 Jun 2014 20:00:08 +0000 (20:00 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 4 Jun 2014 20:00:08 +0000 (20:00 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 4 Jun 2014 20:00:08 +0000 (20:00 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 4 Jun 2014 20:00:08 +0000 (20:00 +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>
	Wed, 4 Jun 2014 20:00:08 +0000 (20:00 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 4 Jun 2014 20:00:08 +0000 (20:00 +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