Merge "Redefine behavior for NvpAdvancedPlugin during network creation"

author Jenkins <jenkins@review.openstack.org>

Fri, 27 Sep 2013 14:08:57 +0000 (14:08 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 27 Sep 2013 14:08:57 +0000 (14:08 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 27 Sep 2013 14:08:57 +0000 (14:08 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 27 Sep 2013 14:08:57 +0000 (14:08 +0000)
diff --cc neutron/plugins/nicira/NeutronServicePlugin.py
Simple merge
diff --cc neutron/plugins/nicira/vshield/edge_appliance_driver.py
Simple merge
diff --cc neutron/tests/unit/nicira/test_edge_router.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 27 Sep 2013 14:08:57 +0000 (14:08 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 27 Sep 2013 14:08:57 +0000 (14:08 +0000)
		1	2
neutron/plugins/nicira/NeutronServicePlugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/nicira/vshield/edge_appliance_driver.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/nicira/test_edge_router.py	patch \|	diff1 \|	diff2 \|	blob \| history