Merge lp:~rlane/nova/lp732924 into lp:~hudson-openstack/nova/trunk

Proposed by Ryan Lane
Status: Merged
Approved by: Jay Pipes
Approved revision: 402
Merged at revision: 789
Proposed branch: lp:~rlane/nova/lp732924
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/api/ec2/ (+1/-1)
To merge this branch: bzr merge lp:~rlane/nova/lp732924
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Vish Ishaya (community) Approve
Review via email:

Description of the change

Changes the output of status in describe_volumes from showing the user as the owner of the volume to showing the project as the owner.

To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :


review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

also lgtm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/api/ec2/'
2--- nova/api/ec2/ 2011-03-10 04:42:11 +0000
3+++ nova/api/ec2/ 2011-03-11 17:30:49 +0000
4@@ -562,7 +562,7 @@
5 if context.is_admin:
6 v['status'] = '%s (%s, %s, %s, %s)' % (
7 volume['status'],
8- volume['user_id'],
9+ volume['project_id'],
10 volume['host'],
11 instance_data,
12 volume['mountpoint'])