diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-23 20:40:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-23 20:40:46 +0000 |
| commit | c7378032c8bbdc77efb98f427b73df096dd82085 (patch) | |
| tree | 8556df7950b6093406208b3a5d04eb6c49a81fb1 /nova/db | |
| parent | 1a2d94f39e4119263b31d3ede2beb90c658dc19a (diff) | |
| parent | 31506c0a252f06e283eecc54741f6a3062fbe913 (diff) | |
Merge "Permit deleted instance types to be queried for active instances."
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index c07f2c9de..78fcaa7e5 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -319,8 +319,7 @@ class InstanceTypes(BASE, NovaBase): foreign_keys=id, primaryjoin='and_(' 'Instance.instance_type_id == ' - 'InstanceTypes.id, ' - 'InstanceTypes.deleted == False)') + 'InstanceTypes.id)') class Volume(BASE, NovaBase): |