diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 07:47:49 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 07:47:49 -0700 |
| commit | 2b5bbc2570cd8ec9d56718315c8a086f4f4dd7db (patch) | |
| tree | 651a3fb024110446540fdfbb9b3437c3ced4a874 | |
| parent | 33631c21e71d85910a20997881735aa43160d36a (diff) | |
| parent | 33d832ee798bc9530be577e3234ff8bcdac4939e (diff) | |
| download | nova-2b5bbc2570cd8ec9d56718315c8a086f4f4dd7db.tar.gz nova-2b5bbc2570cd8ec9d56718315c8a086f4f4dd7db.tar.xz nova-2b5bbc2570cd8ec9d56718315c8a086f4f4dd7db.zip | |
merged orm
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 846fe362f..b6ae90e16 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -369,7 +369,6 @@ class FloatingIp(BASE, NovaBase): ).filter_by(deleted=False ).one() except exc.NoResultFound: - session.rollback() new_exc = exception.NotFound("No model for address %s" % str_id) raise new_exc.__class__, new_exc, sys.exc_info()[2] |