Merge "Add extraroute_db support for Cisco N1kv Plugin"

author Jenkins <jenkins@review.openstack.org>

Sat, 15 Mar 2014 01:22:57 +0000 (01:22 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 15 Mar 2014 01:22:57 +0000 (01:22 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 15 Mar 2014 01:22:57 +0000 (01:22 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 15 Mar 2014 01:22:57 +0000 (01:22 +0000)
diff --cc neutron/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
Simple merge
diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 15 Mar 2014 01:22:57 +0000 (01:22 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 15 Mar 2014 01:22:57 +0000 (01:22 +0000)
		1	2
neutron/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history