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 c2e3e77148ebdf3bfab8ddd0c63274ed0301ed3e..1b3912ee638334fac23133b37495955658740650 100644 (file)
--- 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 baeafa3f3d7519452a827d9d67686f932d2ecb19..e1781edcad8ff1e94febc25803f17d7b1760193c 100644 (file)
--- 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