Merge "NEC plugin: PFC packet fitler support"

author Jenkins <jenkins@review.openstack.org>

Wed, 5 Mar 2014 14:22:11 +0000 (14:22 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 5 Mar 2014 14:22:11 +0000 (14:22 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 5 Mar 2014 14:22:11 +0000 (14:22 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 5 Mar 2014 14:22:11 +0000 (14:22 +0000)
diff --cc neutron/api/v2/attributes.py
Simple merge
diff --cc neutron/plugins/nec/nec_plugin.py
Simple merge
diff --cc neutron/tests/unit/test_attributes.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 5 Mar 2014 14:22:11 +0000 (14:22 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 5 Mar 2014 14:22:11 +0000 (14:22 +0000)
		1	2
neutron/api/v2/attributes.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/nec/nec_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_attributes.py	patch \|	diff1 \|	diff2 \|	blob \| history