Merge "Fix test_external_tables_not_changed"

author Jenkins <jenkins@review.openstack.org>

Wed, 9 Sep 2015 16:51:54 +0000 (16:51 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 9 Sep 2015 16:51:54 +0000 (16:51 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 9 Sep 2015 16:51:54 +0000 (16:51 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 9 Sep 2015 16:51:54 +0000 (16:51 +0000)
diff --cc neutron/db/migration/alembic_migrations/env.py
Simple merge
diff --cc neutron/tests/functional/db/test_migrations.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 9 Sep 2015 16:51:54 +0000 (16:51 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 9 Sep 2015 16:51:54 +0000 (16:51 +0000)
		1	2
neutron/db/migration/alembic_migrations/env.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/functional/db/test_migrations.py	patch \|	diff1 \|	diff2 \|	blob \| history