Merge "Add support for NSX/NVP DHCP services"

author Jenkins <jenkins@review.openstack.org>

Sat, 30 Nov 2013 04:09:11 +0000 (04:09 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 30 Nov 2013 04:09:11 +0000 (04:09 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 30 Nov 2013 04:09:11 +0000 (04:09 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 30 Nov 2013 04:09:11 +0000 (04:09 +0000)
diff --cc etc/neutron/plugins/nicira/nvp.ini
Simple merge
diff --cc neutron/plugins/nicira/NeutronPlugin.py
Simple merge
diff --cc neutron/plugins/nicira/common/config.py
Simple merge
diff --cc neutron/tests/unit/nicira/etc/nvp.ini.agentless.test
Simple merge
diff --cc neutron/tests/unit/nicira/test_nvpopts.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 30 Nov 2013 04:09:11 +0000 (04:09 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 30 Nov 2013 04:09:11 +0000 (04:09 +0000)
		1	2
etc/neutron/plugins/nicira/nvp.ini	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/nicira/NeutronPlugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/nicira/common/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/nicira/etc/nvp.ini.agentless.test	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/nicira/test_nvpopts.py	patch \|	diff1 \|	diff2 \|	blob \| history