From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 26 Aug 2014 17:15:28 +0000 (+0000)
Subject: Merge "Change autogenerate to be unconditional"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2f7932055247df3ac5ec4783e029cfeda0466f71;p=openstack-build%2Fneutron-build.git

Merge "Change autogenerate to be unconditional"
---

2f7932055247df3ac5ec4783e029cfeda0466f71
diff --cc neutron/db/migration/alembic_migrations/env.py
index 98c2678ea,46981e02e..9866068b3
--- a/neutron/db/migration/alembic_migrations/env.py
+++ b/neutron/db/migration/alembic_migrations/env.py
@@@ -18,12 -18,11 +18,12 @@@ from logging import config as logging_c
  
  from alembic import context
  from oslo.config import cfg
 +from oslo.db.sqlalchemy import session
  import sqlalchemy as sa
 -from sqlalchemy import create_engine, event, pool
 +from sqlalchemy import event
  
+ from neutron.db.migration.models import head  # noqa
  from neutron.db import model_base
- from neutron.openstack.common import importutils
  
  
  MYSQL_ENGINE = None