From c9cb3dc184fa32a0e261733bb41fb38a56cd5ea9 Mon Sep 17 00:00:00 2001
From: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date: Wed, 20 Feb 2013 16:00:44 +0900
Subject: [PATCH] Resolve branches in db migration scripts to G-3 release

Fixes bug #1129260

Change-Id: I5c70ee6d464f8fc0b2e4cdb4fc07464e150e10ff
---
 .../versions/1c33fa3cd1a1_extra_route_config.py               | 4 ++--
 .../versions/363468ac592c_nvp_network_gw.py                   | 4 ++--
 .../versions/3b54bf9e29f7_nec_plugin_sharednet.py             | 4 ++--
 .../versions/511471cc46b_agent_ext_model_supp.py              | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py b/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
index e223b21742..4d18f146e9 100644
--- a/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
+++ b/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
@@ -18,14 +18,14 @@
 """Support routring table configration on Router
 
 Revision ID: 1c33fa3cd1a1
-Revises: 1d76643bcec4
+Revises: 45680af419f9
 Create Date: 2013-01-17 14:35:09.386975
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '1c33fa3cd1a1'
-down_revision = '1d76643bcec4'
+down_revision = '45680af419f9'
 
 # Change to ['*'] if this migration applies to all plugins
 
diff --git a/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py b/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py
index 2cbb5a1749..eda8db8b64 100644
--- a/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py
+++ b/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py
@@ -18,14 +18,14 @@
 """nvp_network_gw
 
 Revision ID: 363468ac592c
-Revises: 38335592a0dc
+Revises: 1c33fa3cd1a1
 Create Date: 2013-02-07 03:19:14.455372
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '363468ac592c'
-down_revision = '38335592a0dc'
+down_revision = '1c33fa3cd1a1'
 
 # Change to ['*'] if this migration applies to all plugins
 
diff --git a/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py b/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py
index 838f14efd5..a67107d4c1 100644
--- a/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py
+++ b/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py
@@ -18,14 +18,14 @@
 """NEC plugin sharednet
 
 Revision ID: 3b54bf9e29f7
-Revises: 54c2c487e913
+Revises: 511471cc46b
 Create Date: 2013-02-17 09:21:48.287134
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '3b54bf9e29f7'
-down_revision = '54c2c487e913'
+down_revision = '511471cc46b'
 
 # Change to ['*'] if this migration applies to all plugins
 
diff --git a/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py b/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py
index 7151164ebf..7c8855c90e 100644
--- a/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py
+++ b/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py
@@ -18,14 +18,14 @@
 """Add agent management extension model support
 
 Revision ID: 511471cc46b
-Revises: 54c2c487e913
+Revises: 363468ac592c
 Create Date: 2013-02-18 05:09:32.523460
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '511471cc46b'
-down_revision = '54c2c487e913'
+down_revision = '363468ac592c'
 
 # Change to ['*'] if this migration applies to all plugins