Merge "Remove duplicated l3 router scheduler test cases"

author Jenkins <jenkins@review.openstack.org>

Tue, 28 Apr 2015 08:54:15 +0000 (08:54 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 28 Apr 2015 08:54:15 +0000 (08:54 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 28 Apr 2015 08:54:15 +0000 (08:54 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 28 Apr 2015 08:54:15 +0000 (08:54 +0000)
diff --cc neutron/tests/unit/plugins/cisco/n1kv/test_n1kv_plugin.py
Simple merge
diff --cc neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 28 Apr 2015 08:54:15 +0000 (08:54 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 28 Apr 2015 08:54:15 +0000 (08:54 +0000)
		1	2
neutron/tests/unit/plugins/cisco/n1kv/test_n1kv_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/scheduler/test_l3_agent_scheduler.py	patch \|	diff1 \|	diff2 \|	blob \| history