diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-14 04:25:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-14 04:25:26 +0000 |
| commit | 0453f367180eff08bc3a5cdaaba9998e38812852 (patch) | |
| tree | 5ae338384de8c8432830a59d2ee2c05eef2523ae | |
| parent | 99c0a48482611ed085c6206f5510ba16bccd142d (diff) | |
| parent | 394713eaef63f28f5ea298aeac4ae1f7c76fa167 (diff) | |
| download | nova-0453f367180eff08bc3a5cdaaba9998e38812852.tar.gz nova-0453f367180eff08bc3a5cdaaba9998e38812852.tar.xz nova-0453f367180eff08bc3a5cdaaba9998e38812852.zip | |
Merge "Fix regression in non-admin simple_usage:show."
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 81d26d2d8..10441cd23 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1656,7 +1656,7 @@ def regex_filter(query, model, filters): return query -@require_admin_context +@require_context def instance_get_active_by_window_joined(context, begin, end=None, project_id=None, host=None): """Return instances and joins that were active during window.""" |