Solve branch in migration path

Bug #1153578

Also, change a comment line in another migration where the 'revises' line
was incosistent with the id of the actual down_revision

Change-Id: I8effd70ba553330f9023605a2bfa92bd3d73bd4e

diff --git a/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py b/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py
index c1f83a3e6f5a479b6bc3157628c27b5a6a37dfc5..cd81b8115eeb271ee1cbdce8e770d28790ca97f2 100644 (file)
--- a/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py
+++ b/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py
@@ -18,14 +18,14 @@
 """nvp_net_binding
 
 Revision ID: 1341ed32cc1e
-Revises: 3b54bf9e29f7
+Revises: 4692d074d587
 Create Date: 2013-02-26 01:28:29.182195
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '1341ed32cc1e'
-down_revision = '3b54bf9e29f7'
+down_revision = '4692d074d587'
 
 # Change to ['*'] if this migration applies to all plugins
 

diff --git a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
index 5f392076bbb9176387a39feef02c036707d7baec..bb2cd78dcc79f6140b029665fac2bd69671fc877 100644 (file)
--- a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
+++ b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
@@ -18,7 +18,7 @@
 """nvp_netbinding
 
 Revision ID: 1d76643bcec4
-Revises: 48b6f43f7471
+Revises: 3cb5d900c5de
 Create Date: 2013-01-15 07:36:10.024346
 
 """