From c8521da3539d28dce56a914d89c43c4908e46e57 Mon Sep 17 00:00:00 2001
From: Brian Schott <bschott@isi.edu>
Date: Fri, 11 Feb 2011 19:03:45 -0500
Subject: fixed exceptions import from python migrate

---
 nova/db/sqlalchemy/migration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index 2a13c5466..acd03ba34 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -22,7 +22,7 @@ from nova import flags
 
 import sqlalchemy
 from migrate.versioning import api as versioning_api
-from migrate.versioning import exceptions as versioning_exceptions
+from migrate import exceptions as versioning_exceptions
 
 FLAGS = flags.FLAGS
 
-- 
cgit 


From 9be342534ee54f86c274f03d1d4a0c310f08e4ae Mon Sep 17 00:00:00 2001
From: Brian Schott <bschott@isi.edu>
Date: Wed, 16 Feb 2011 13:24:46 -0500
Subject: fixed authors, import sys in migration.py

---
 Authors                         | 2 +-
 nova/db/sqlalchemy/migration.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Authors b/Authors
index 0edabc531..29fbf76b3 100644
--- a/Authors
+++ b/Authors
@@ -4,7 +4,7 @@ Anthony Young <sleepsonthefloor@gmail.com>
 Antony Messerli <ant@openstack.org>
 Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
 Bilal Akhtar <bilalakhtar@ubuntu.com>
-Brian Schott <bschott@isi.edu>
+Brian Schott <bschott@isi.edu> <bfschott@gmail.com>
 Chiradeep Vittal <chiradeep@cloud.com>
 Chmouel Boudjnah <chmouel@chmouel.com>
 Chris Behrens <cbehrens@codestud.com>
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index 3b6b4707a..d2671e1a3 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -17,6 +17,7 @@
 #    under the License.
 
 import os
+import sys
 
 from nova import flags
 
-- 
cgit