Eucalyptus

Merge lp://qastaging/~mathiaz/eucalyptus/k-fix-network-index-values into lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic

  1. k-fix-network-index-values
  2. Merge into ubuntu-karmic
Proposed by Mathias Gug
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp://qastaging/~mathiaz/eucalyptus/k-fix-network-index-values
Merge into: lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic
Diff against target: 29 lines
2 files modified
cluster/handlers.c (+3/-1)
debian/changelog (+4/-0)
To merge this branch: bzr merge lp://qastaging/~mathiaz/eucalyptus/k-fix-network-index-values
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Review via email: mp+14329@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cluster/handlers.c'
2--- cluster/handlers.c 2009-10-22 14:06:55 +0000
3+++ cluster/handlers.c 2009-11-02 23:20:26 +0000
4@@ -1484,7 +1484,9 @@
5 allocate_ccInstance(myInstance, instId, amiId, kernelId, ramdiskId, amiURL, kernelURL, ramdiskURL, ownerId, "Pending", time(NULL), reservationId, &(myInstance->ccnet), &(myInstance->ccvm), myInstance->ncHostIdx, keyName, myInstance->serviceTag, userData, launchIndex, myInstance->groupNames, myInstance->volumes, myInstance->volumesSize, myInstance->networkIndex);
6
7 // instance info that CC has
8- myInstance->networkIndex = thenidx;
9+ if (thenidx >= 0) {
10+ myInstance->networkIndex = networkIndexList[thenidx];
11+ }
12 myInstance->ts = time(NULL);
13 if (strcmp(pubip, "0.0.0.0")) {
14 strncpy(myInstance->ccnet.publicIp, pubip, 16);
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2009-11-02 23:10:25 +0000
18+++ debian/changelog 2009-11-02 23:20:26 +0000
19@@ -11,6 +11,10 @@
20 * debian/eucalyptus-common.eucalyptus.upstart: Add -l to eucalyptus-cloud
21 options so that cloud-output.log is affected by LOGLEVEL (LP: #458001)
22
23+ [ Mathias Gug ]
24+ * cluster/handlers.c: Fix the networkIndex returned by describeInstances.
25+ (LP: #454405 - upstream revno 933).
26+
27 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +0200
28
29 eucalyptus (1.6~bzr931-0ubuntu7) karmic; urgency=low

Subscribers

People subscribed via source and target branches

to all changes: