openstack
/
neutron
Code Issues Proposed changes

Move 1c844d1677f7 expand migration to appropriate branch 

Commit cb60d0bb4e 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
This commit is contained in:
Salvatore Orlando 2015-08-02 23:36:54 -07:00
parent 9c71544c3b
commit 6fda25daa2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/migration/alembic_migrations/versions/HEADS
View File

@ -1,3 +1,3 @@
1c844d1677f7
26c371498592
2a16083502f3
kilo

4
neutron/db/migration/alembic_migrations/versions/liberty/expand/1c844d1677f7_dns_nameservers_order.py
View File

@ -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