diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 23:26:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 23:26:00 +0000 |
| commit | eebd9b16b972bd5b83ba58188940ca9477938d51 (patch) | |
| tree | 5be7f1f0d1e9e9cfdbb8413d7bf4e6f120e78320 /nova/db | |
| parent | 4b9c7c11ed96b3115624fa965701a7fbddf7b47c (diff) | |
| parent | cdf10381caad217ae9eb99c69a4226e40ba81db4 (diff) | |
| download | nova-eebd9b16b972bd5b83ba58188940ca9477938d51.tar.gz nova-eebd9b16b972bd5b83ba58188940ca9477938d51.tar.xz nova-eebd9b16b972bd5b83ba58188940ca9477938d51.zip | |
Merge "Fix a race where a soft deleted instance might be removed by mistake"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ecedb8a0b..6853a4a2c 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1752,7 +1752,7 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir, # For other filters that don't match this, we will do regexp matching exact_match_filter_names = ['project_id', 'user_id', 'image_ref', 'vm_state', 'instance_type_id', 'uuid', - 'metadata', 'host'] + 'metadata', 'host', 'task_state'] # Filter the query query_prefix = exact_filter(query_prefix, models.Instance, |