diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-26 16:28:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-26 16:28:31 +0000 |
| commit | 028bf2184922a263a5a72b1b81bd727a4558764f (patch) | |
| tree | cc8c23f42354f41069e869df653ce373dbf5088e | |
| parent | 2f97345472a8bafa17c425bccfb7b81b46b8d6d5 (diff) | |
| parent | 911aca7d5a5554c60727410c793da0e24a9a743a (diff) | |
| download | nova-028bf2184922a263a5a72b1b81bd727a4558764f.tar.gz nova-028bf2184922a263a5a72b1b81bd727a4558764f.tar.xz nova-028bf2184922a263a5a72b1b81bd727a4558764f.zip | |
Merge "Add system_metadata to db.instance_get_active_by_window_joined"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 1980c22ad..75e614522 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1715,6 +1715,7 @@ def instance_get_active_by_window_joined(context, begin, end=None, options(joinedload('security_groups')).\ options(joinedload('metadata')).\ options(joinedload('instance_type')).\ + options(joinedload('system_metadata')).\ filter(or_(models.Instance.terminated_at == None, models.Instance.terminated_at > begin)) if end: |