Merge "Schedule net to a DHCP agt on subnet create"

author Jenkins <jenkins@review.openstack.org>

Tue, 17 Mar 2015 07:29:22 +0000 (07:29 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 17 Mar 2015 07:29:22 +0000 (07:29 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 17 Mar 2015 07:29:22 +0000 (07:29 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 17 Mar 2015 07:29:22 +0000 (07:29 +0000)
diff --cc neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
Simple merge
diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
Simple merge
diff --cc neutron/tests/unit/openvswitch/test_agent_scheduler.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 17 Mar 2015 07:29:22 +0000 (07:29 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 17 Mar 2015 07:29:22 +0000 (07:29 +0000)
		1	2
neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/openvswitch/test_agent_scheduler.py	patch \|	diff1 \|	diff2 \|	blob \| history