diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-07-29 20:19:48 +0000 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-07-29 20:19:48 +0000 |
| commit | 649b0da35dbc36ce15cd3ada6e4e4b814a244158 (patch) | |
| tree | c7c8317fd4d5f8f045b5d3fe113730bd48eb011e /nova/compute | |
| parent | 73711a9e260fd8b6f747b9c8f09511eba149a1fb (diff) | |
| parent | bdcfaa5b927a096f507fb0f7e2d81989173957f8 (diff) | |
pull-up from trunk and conflict resolution
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index d1e5647d2..8f7b3c3ef 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -689,7 +689,7 @@ class API(base.Base): raise instances = None elif project_id or not context.is_admin: - if not context.project: + if not context.project_id: instances = self.db.instance_get_all_by_user( context, context.user_id) else: |