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
=== modified file 'Authors'
--- Authors 2011-09-08 18:47:56 +0000
+++ Authors 2011-09-20 03:24:17 +0000
@@ -12,6 +12,7 @@
12Arvind Somya <asomya@cisco.com>12Arvind Somya <asomya@cisco.com>
13Bilal Akhtar <bilalakhtar@ubuntu.com>13Bilal Akhtar <bilalakhtar@ubuntu.com>
14Brad Hall <brad@nicira.com>14Brad Hall <brad@nicira.com>
15Brad McConnell <bmcconne@rackspace.com>
15Brian Lamar <brian.lamar@rackspace.com>16Brian Lamar <brian.lamar@rackspace.com>
16Brian Schott <bschott@isi.edu>17Brian Schott <bschott@isi.edu>
17Brian Waldon <brian.waldon@rackspace.com>18Brian Waldon <brian.waldon@rackspace.com>
1819
=== modified file 'bin/nova-manage'
--- bin/nova-manage 2011-09-17 02:12:50 +0000
+++ bin/nova-manage 2011-09-20 03:24:17 +0000
@@ -738,7 +738,7 @@
738 help='Multi host')738 help='Multi host')
739 @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')739 @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
740 @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')740 @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
741 @args('--uuid', dest="net_uuid", metavar="<network uuid>",741 @args('--uuid', dest="uuid", metavar="<network uuid>",
742 help='Network UUID')742 help='Network UUID')
743 @args('--project_id', dest="project_id", metavar="<project id>",743 @args('--project_id', dest="project_id", metavar="<project id>",
744 help='Project id')744 help='Project id')