diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-13 22:01:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-13 22:01:13 +0000 |
| commit | 30063dd5a53170b9c95e02c882abce10419e7ca2 (patch) | |
| tree | 43155ec4df6caf23ec1aeded2a1164fcd70e363f /nova/db/sqlalchemy/models.py | |
| parent | 6c96898019174d4c7b4b081a2c9016a51bdfa4f1 (diff) | |
| parent | edf57ca3f4e822e45300f50471fbb90f14f1ab94 (diff) | |
| download | nova-30063dd5a53170b9c95e02c882abce10419e7ca2.tar.gz nova-30063dd5a53170b9c95e02c882abce10419e7ca2.tar.xz nova-30063dd5a53170b9c95e02c882abce10419e7ca2.zip | |
Merge "Don't load system_metadata when it isn't joined."
Diffstat (limited to 'nova/db/sqlalchemy/models.py')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 3f45c614b..ce5f84578 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -154,7 +154,7 @@ class Instance(BASE, NovaBase): return base_name def _extra_keys(self): - return ['name', 'system_metadata'] + return ['name'] user_id = Column(String(255)) project_id = Column(String(255)) |