diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-08 17:10:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-08 17:10:21 +0000 |
| commit | 293275338134ea8311716a2fcc1dbd9cc38b84f8 (patch) | |
| tree | 22ff304a95f09ed86a70eebdf3e4938728469df0 | |
| parent | fb959728245300910222edfd5e19a3431a454cb9 (diff) | |
| parent | 24f4e093b6c7290de06b7aaaa1e4dda96e17e5f9 (diff) | |
| download | nova-293275338134ea8311716a2fcc1dbd9cc38b84f8.tar.gz nova-293275338134ea8311716a2fcc1dbd9cc38b84f8.tar.xz nova-293275338134ea8311716a2fcc1dbd9cc38b84f8.zip | |
Merge "info_cache is related to deleted instance"
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 48b59a680..379557f18 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -297,9 +297,7 @@ class InstanceInfoCache(BASE, NovaBase): instance = relationship(Instance, backref=backref('info_cache', uselist=False), foreign_keys=instance_id, - primaryjoin='and_(' - 'InstanceInfoCache.instance_id == Instance.uuid,' - 'InstanceInfoCache.deleted == False)') + primaryjoin=instance_id == Instance.uuid) class VirtualStorageArray(BASE, NovaBase): |