diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-07 22:40:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-07 22:40:01 +0000 |
| commit | 4c8fc34d736d6575da86d5c32d0d9c2f25e16c8b (patch) | |
| tree | be468ff12455298e0d12f9ccd14ed34b156f2319 /nova | |
| parent | 90c02e2cf93c188b45903d0815bea6920db279da (diff) | |
| parent | ecb1f61412cbeb074ebd8ba5a123e2a55821c148 (diff) | |
| download | nova-4c8fc34d736d6575da86d5c32d0d9c2f25e16c8b.tar.gz nova-4c8fc34d736d6575da86d5c32d0d9c2f25e16c8b.tar.xz nova-4c8fc34d736d6575da86d5c32d0d9c2f25e16c8b.zip | |
Merge "Fix lazy load 'system_metadata' failed problem."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index fb39600c4..874c7cf7b 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1705,7 +1705,8 @@ def _instance_get_all_query(context, project_only=False): options(joinedload('info_cache')).\ options(joinedload('security_groups')).\ options(joinedload('metadata')).\ - options(joinedload('instance_type')) + options(joinedload('instance_type')).\ + options(joinedload('system_metadata')) @require_admin_context |