From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 1 Apr 2014 16:28:11 +0000 (+0800)
Subject: Refreshed fix-alembic-migration-with-sqlite3.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cab6bbc0fd60f6908bd37c05998987edd8bc9f75;p=openstack-build%2Fneutron-build.git

Refreshed fix-alembic-migration-with-sqlite3.patch

Change-Id: Ib69cefb5e218a33193e494c81d43227c958d7b40

Rewritten-From: dd90ffd31808f672d4932f333b755b043505b0ad
---

diff --git a/xenial/debian/patches/fix-alembic-migration-with-sqlite3.patch b/xenial/debian/patches/fix-alembic-migration-with-sqlite3.patch
index 58df40dbe..2897d816d 100644
--- a/xenial/debian/patches/fix-alembic-migration-with-sqlite3.patch
+++ b/xenial/debian/patches/fix-alembic-migration-with-sqlite3.patch
@@ -10,9 +10,9 @@ Last-Update: 2013-10-22
 
 Index: neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
 ===================================================================
---- neutron.orig/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py	2014-03-13 15:06:43.000000000 +0800
-+++ neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py	2014-03-13 15:07:13.000000000 +0800
-@@ -56,9 +56,9 @@
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py	2014-04-02 00:09:00.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py	2014-04-02 00:27:32.000000000 +0800
+@@ -59,9 +59,9 @@
          return
  
      op.add_column('routers', sa.Column('enable_snat', sa.Boolean(),
@@ -26,8 +26,8 @@ Index: neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext
  def downgrade(active_plugins=None, options=None):
 Index: neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
 ===================================================================
---- neutron.orig/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py	2014-03-13 14:49:49.000000000 +0800
-+++ neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py	2014-03-13 15:07:13.000000000 +0800
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py	2014-04-02 00:07:50.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py	2014-04-02 00:27:32.000000000 +0800
 @@ -46,11 +46,27 @@
      if not migration.should_run(active_plugins, migration_for_plugins):
          return
@@ -63,8 +63,8 @@ Index: neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_
  def downgrade(active_plugins=None, options=None):
 Index: neutron/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
 ===================================================================
---- neutron.orig/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py	2014-03-13 14:49:49.000000000 +0800
-+++ neutron/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py	2014-03-13 15:07:13.000000000 +0800
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py	2014-04-02 00:07:50.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py	2014-04-02 00:27:32.000000000 +0800
 @@ -38,7 +38,42 @@