OpenStack Compute (nova)

Merge lp:~gundlach/nova/novash into lp:~hudson-openstack/nova/trunk

  1. novash
  2. Merge into trunk
Proposed by Michael Gundlach
Status: Merged
Approved by: Michael Gundlach
Approved revision: 429
Merged at revision: 430
Proposed branch: lp:~gundlach/nova/novash
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 11 lines (+0/-1)
1 file modified
contrib/nova.sh (+0/-1)
To merge this branch: bzr merge lp:~gundlach/nova/novash
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Jay Pipes (community) Needs Fixing
Review via email: mp+42195@code.launchpad.net

Description of the change

Delete unused flag in nova.sh.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

Needs a remerge with trunk since vishy's changeset to nova.sh...

review: Needs Fixing
Revision history for this message
Eric Day (eday) wrote :

lgtm, but in the future you should keep your branches separate unless they require building on one another (this includes the server-mgmt-url patch too). When they are related, you should list the prerequisite branches so Launchpad only shows the correct diff too.

review: Approve
Revision history for this message
Michael Gundlach (gundlach) wrote :

Hmm, I thought my latest merge from trunk would get rid of the superfluous auth-related lines in LP's diff, but no. We'll see how the merge goes.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Michael Gundlach (gundlach) wrote :

Oh indeed!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/nova.sh'
2--- contrib/nova.sh 2010-11-29 21:23:21 +0000
3+++ contrib/nova.sh 2010-11-30 20:01:20 +0000
4@@ -46,7 +46,6 @@
5 --verbose
6 --nodaemon
7 --dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf
8---FAKE_subdomain=ec2
9 --network_manager=nova.network.manager.$NET_MAN
10 --cc_host=$HOST_IP
11 --routing_source_ip=$HOST_IP