Merge "Add migration support from agent to NSX dhcp/metadata services"

author Jenkins <jenkins@review.openstack.org>

Wed, 12 Feb 2014 10:22:32 +0000 (10:22 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 12 Feb 2014 10:22:32 +0000 (10:22 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 12 Feb 2014 10:22:32 +0000 (10:22 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 12 Feb 2014 10:22:32 +0000 (10:22 +0000)
diff --cc neutron/plugins/nicira/NeutronPlugin.py
Simple merge
diff --cc setup.cfg
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 12 Feb 2014 10:22:32 +0000 (10:22 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 12 Feb 2014 10:22:32 +0000 (10:22 +0000)
		1	2
neutron/plugins/nicira/NeutronPlugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
setup.cfg	patch \|	diff1 \|	diff2 \|	blob \| history