OpenStack Compute (nova)

Merge lp:~bmcconne/nova/bugfixbranch into lp:~hudson-openstack/nova/trunk

  1. bugfixbranch
  2. Merge into trunk
Proposed by Brad McConnell
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1600
Merged at revision: 1601
Proposed branch: lp:~bmcconne/nova/bugfixbranch
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 24 lines (+2/-1)
2 files modified
Authors (+1/-0)
bin/nova-manage (+1/-1)
To merge this branch: bzr merge lp:~bmcconne/nova/bugfixbranch
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Chris Behrens (community) Approve
Trey Morris (community) Approve
Review via email: mp+76138@code.launchpad.net

Description of the change

Fixed --uuid network command in nova-manage to desc to "uuid" instead of "net_uuid"

To post a comment you must log in.
lp:~bmcconne/nova/bugfixbranch updated
1600. By Brad McConnell <email address hidden>

added to authors cuz trey said I cant patch otherwise!

Revision history for this message
Trey Morris (tr3buchet) wrote :

looks good to me

review: Approve
Revision history for this message
Chris Behrens (cbehrens) wrote :

Aw, his first merge prop. How cute ;)
Looks good.

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Authors'
2--- Authors 2011-09-08 18:47:56 +0000
3+++ Authors 2011-09-20 03:24:17 +0000
4@@ -12,6 +12,7 @@
5 Arvind Somya <asomya@cisco.com>
6 Bilal Akhtar <bilalakhtar@ubuntu.com>
7 Brad Hall <brad@nicira.com>
8+Brad McConnell <bmcconne@rackspace.com>
9 Brian Lamar <brian.lamar@rackspace.com>
10 Brian Schott <bschott@isi.edu>
11 Brian Waldon <brian.waldon@rackspace.com>
12
13=== modified file 'bin/nova-manage'
14--- bin/nova-manage 2011-09-17 02:12:50 +0000
15+++ bin/nova-manage 2011-09-20 03:24:17 +0000
16@@ -738,7 +738,7 @@
17 help='Multi host')
18 @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
19 @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
20- @args('--uuid', dest="net_uuid", metavar="<network uuid>",
21+ @args('--uuid', dest="uuid", metavar="<network uuid>",
22 help='Network UUID')
23 @args('--project_id', dest="project_id", metavar="<project id>",
24 help='Project id')