From: Salvatore Orlando Date: Mon, 3 Aug 2015 06:36:54 +0000 (-0700) Subject: Move 1c844d1677f7 expand migration to appropriate branch X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6fda25daa28743ad7d8e8156bb80f4e8b084764b;p=openstack-build%2Fneutron-build.git Move 1c844d1677f7 expand migration to appropriate branch Commit cb60d0bb4e0cc0cba68f59fdf5f4e89d6ec52950 added an expand migration. Howewer it indicated a contract migration as its ancestor (2a16083502f3). As a result the migration was treated by alembic as a contract one, even if it was defined in the 'expand' directory. This patch 'rebases' this migration on top of the expand branch HEAD. This might impact trunk chasers which have already executed migration 1c844d1677f7 as a part of the contract branch. Change-Id: I431aa684ccd029c6cff37a7666bb7ce1a7541f9c --- diff --git a/neutron/db/migration/alembic_migrations/versions/HEADS b/neutron/db/migration/alembic_migrations/versions/HEADS index c2e3e7714..1b3912ee6 100644 --- a/neutron/db/migration/alembic_migrations/versions/HEADS +++ b/neutron/db/migration/alembic_migrations/versions/HEADS @@ -1,3 +1,3 @@ 1c844d1677f7 -26c371498592 +2a16083502f3 kilo diff --git a/neutron/db/migration/alembic_migrations/versions/liberty/expand/1c844d1677f7_dns_nameservers_order.py b/neutron/db/migration/alembic_migrations/versions/liberty/expand/1c844d1677f7_dns_nameservers_order.py index baeafa3f3..e1781edca 100644 --- a/neutron/db/migration/alembic_migrations/versions/liberty/expand/1c844d1677f7_dns_nameservers_order.py +++ b/neutron/db/migration/alembic_migrations/versions/liberty/expand/1c844d1677f7_dns_nameservers_order.py @@ -16,14 +16,14 @@ """add order to dnsnameservers Revision ID: 1c844d1677f7 -Revises: 2a16083502f3 +Revises: 26c371498592 Create Date: 2015-07-21 22:59:03.383850 """ # revision identifiers, used by Alembic. revision = '1c844d1677f7' -down_revision = '2a16083502f3' +down_revision = '26c371498592' from alembic import op import sqlalchemy as sa