OpenStack Compute (nova)

Merge lp:~xtoddx/nova/lp705314 into lp:~hudson-openstack/nova/trunk

  1. lp705314
  2. Merge into trunk
Proposed by Todd Willey
Status: Merged
Approved by: Vish Ishaya
Approved revision: 595
Merged at revision: 597
Proposed branch: lp:~xtoddx/nova/lp705314
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 19 lines (+8/-1)
1 file modified
etc/nova-api.conf (+8/-1)
To merge this branch: bzr merge lp:~xtoddx/nova/lp705314
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Devin Carlen (community) Approve
Review via email: mp+46975@code.launchpad.net

Description of the change

Fix metadata using versions other than /later. Patch via ~ttx

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

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

lgtm

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/nova-api.conf'
2--- etc/nova-api.conf 2011-01-12 22:47:43 +0000
3+++ etc/nova-api.conf 2011-01-20 21:17:16 +0000
4@@ -11,7 +11,14 @@
5 /services/Cloud: ec2cloud
6 /services/Admin: ec2admin
7 /latest: ec2metadata
8-/20: ec2metadata
9+/2007-01-19: ec2metadata
10+/2007-03-01: ec2metadata
11+/2007-08-29: ec2metadata
12+/2007-10-10: ec2metadata
13+/2007-12-15: ec2metadata
14+/2008-02-01: ec2metadata
15+/2008-09-01: ec2metadata
16+/2009-04-04: ec2metadata
17 /1.0: ec2metadata
18
19 [pipeline:ec2cloud]