diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-12 22:35:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-12 22:35:49 +0000 |
| commit | 7b5ce8f8cc7cffb4b3be2fefb4878a6a6d23b838 (patch) | |
| tree | 4c2ea0ca2cbd65f173c8a6f28f694fc87686a73b /nova | |
| parent | 6f5fc8d5c33d81c4f37d60358460b0fbb94343ad (diff) | |
| parent | 695095a4241edd8cf1b66bcd71e70437eb8a9484 (diff) | |
Merge "remove session param from instance_get"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 973124f77..216fb6e4d 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1501,8 +1501,8 @@ def _instance_get_by_uuid(context, uuid, session=None): @require_context -def instance_get(context, instance_id, session=None): - result = _build_instance_get(context, session=session).\ +def instance_get(context, instance_id): + result = _build_instance_get(context).\ filter_by(id=instance_id).\ first() |