Merge "Add filter for provider network attributes in ML2"

author Jenkins <jenkins@review.openstack.org>

Sat, 28 Feb 2015 00:41:22 +0000 (00:41 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 28 Feb 2015 00:41:22 +0000 (00:41 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 28 Feb 2015 00:41:22 +0000 (00:41 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 28 Feb 2015 00:41:22 +0000 (00:41 +0000)
diff --cc neutron/plugins/ml2/managers.py
Simple merge
diff --cc neutron/plugins/ml2/plugin.py
Simple merge
diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 28 Feb 2015 00:41:22 +0000 (00:41 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 28 Feb 2015 00:41:22 +0000 (00:41 +0000)
		1	2
neutron/plugins/ml2/managers.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/ml2/plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/ml2/test_ml2_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history