diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-29 21:31:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-29 21:31:56 +0000 |
| commit | 019d953ef5b4bed7c53401375bfd7aa890fc0c1d (patch) | |
| tree | 45d4d4c68c253830ea67cc91c3238d3768699672 /nova/db | |
| parent | 50b9c032fdc520c1461ff4651b60b4fc4b8f8e19 (diff) | |
| parent | fd7a111cbfe77decfa5adda35793aae6ac7db6ba (diff) | |
Merge "Ability to read deleted system metadata records."
Diffstat (limited to 'nova/db')
| -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 66102d8c0..9bf3a0e12 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4239,8 +4239,8 @@ def instance_metadata_update(context, instance_uuid, metadata, delete): # System-owned metadata def _instance_system_metadata_get_query(context, instance_uuid, session=None): - return model_query(context, models.InstanceSystemMetadata, session=session, - read_deleted="no").\ + return model_query(context, models.InstanceSystemMetadata, + session=session).\ filter_by(instance_uuid=instance_uuid) |