summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/db/sqlalchemy/api.py2
-rw-r--r--nova/db/sqlalchemy/models.py (renamed from nova/models.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 55367cec2..cba85ccb7 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -23,7 +23,7 @@ import IPy
from nova import db
from nova import exception
from nova import flags
-from nova import models
+from nova.db.sqlalchemy import models
FLAGS = flags.FLAGS
diff --git a/nova/models.py b/nova/db/sqlalchemy/models.py
index 36d6cf3ad..36d6cf3ad 100644
--- a/nova/models.py
+++ b/nova/db/sqlalchemy/models.py