diff options
| author | Jason Koelker <jason@koelker.net> | 2011-09-15 13:47:16 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-09-15 13:47:16 -0500 |
| commit | be156e9f2ac58706c7fd69df06cbd5259ec20675 (patch) | |
| tree | 206565e7b8b1ddd7afdf26a2b46a032a4ebaa354 | |
| parent | 3929ab2f32de6db7fee0394e276a5ceeca356368 (diff) | |
| download | nova-be156e9f2ac58706c7fd69df06cbd5259ec20675.tar.gz nova-be156e9f2ac58706c7fd69df06cbd5259ec20675.tar.xz nova-be156e9f2ac58706c7fd69df06cbd5259ec20675.zip | |
revert last change
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 8cc56c3f9..dc99834e4 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1297,9 +1297,9 @@ def instance_get_all_by_filters(context, filters, instance_uuids=None): if not uuids: return [] - instances = _build_instance_get(context, session=session).\ - filter(models.Instance.uuid.in_(uuids)).\ - all() + instances = session.query(models.Instance).\ + filter(models.Instance.uuid.in_(uuids)).\ + all() # Now filter on everything else for regexp matching.. # For filters not in the list, we'll attempt to use the filter_name |