From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Thu, 18 Jul 2013 20:35:37 +0000 (+0400)
Subject: Fix revision branches appeared after merging recent patches
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=713838e24cfd1a0cfdbedf20b08da15e82cd60e3;p=openstack-build%2Fneutron-build.git

Fix revision branches appeared after merging recent patches

The branch was introduced with "Add status description field for lbaas objects"

fixes bug 1202859

Change-Id: I59394fa2c4d8cee84ce7040a9d03288ec1e4bab4
---

diff --git a/neutron/db/migration/alembic_migrations/versions/2032abe8edac_lbaas_add_status_des.py b/neutron/db/migration/alembic_migrations/versions/2032abe8edac_lbaas_add_status_des.py
index 05b30e3e9..2a91d0de5 100644
--- a/neutron/db/migration/alembic_migrations/versions/2032abe8edac_lbaas_add_status_des.py
+++ b/neutron/db/migration/alembic_migrations/versions/2032abe8edac_lbaas_add_status_des.py
@@ -18,14 +18,14 @@
 """LBaaS add status description
 
 Revision ID: 2032abe8edac
-Revises: b7a8863760e
+Revises: 477a4488d3f4
 Create Date: 2013-06-24 06:51:47.308545
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '2032abe8edac'
-down_revision = 'b7a8863760e'
+down_revision = '477a4488d3f4'
 
 # Change to ['*'] if this migration applies to all plugins