Merge "Added check on plugin.supported_extension_aliases"

author Jenkins <jenkins@review.openstack.org>

Wed, 27 Nov 2013 19:34:36 +0000 (19:34 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 27 Nov 2013 19:34:36 +0000 (19:34 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 27 Nov 2013 19:34:36 +0000 (19:34 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 27 Nov 2013 19:34:36 +0000 (19:34 +0000)
diff --cc neutron/common/exceptions.py
Simple merge
diff --cc neutron/plugins/midonet/plugin.py
Simple merge
diff --cc neutron/plugins/nicira/NeutronPlugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 27 Nov 2013 19:34:36 +0000 (19:34 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 27 Nov 2013 19:34:36 +0000 (19:34 +0000)
		1	2
neutron/common/exceptions.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/midonet/plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/nicira/NeutronPlugin.py	patch \|	diff1 \|	diff2 \|	blob \| history