Eucalyptus

Merge lp:~kirkland/eucalyptus/525675 into lp:eucalyptus/1.6.2

  1. 525675
  2. Merge into 1.6.2
Proposed by Dustin Kirkland 
Status: Merged
Merge reported by: Daniel Nurmi
Merged at revision: not available
Proposed branch: lp:~kirkland/eucalyptus/525675
Merge into: lp:eucalyptus/1.6.2
Diff against target: 11 lines (+1/-1)
1 file modified
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java (+1/-1)
To merge this branch: bzr merge lp:~kirkland/eucalyptus/525675
Reviewer Review Type Date Requested Status
Eucalyptus Maintainers Pending
Review via email: mp+19908@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nurmi (nurmi) wrote :

The latest released version of Eucalytpus (1.6.2, bzr revno 1199) contains this fix already; perhaps we should review the branch from which the package is being created to make sure there isn't a conflict?

Revision history for this message
Daniel Nurmi (nurmi) wrote :

> The latest released version of Eucalytpus (1.6.2, bzr revno 1199) contains
> this fix already; perhaps we should review the branch from which the package
> is being created to make sure there isn't a conflict?

apologies, that is revno 1200, submitted after this merge was suggested; accepting now.

Revision history for this message
Dustin Kirkland  (kirkland) wrote :

On Tue, Feb 23, 2010 at 3:19 PM, Daniel Nurmi <email address hidden> wrote:
> The latest released version of Eucalytpus (1.6.2, bzr revno 1199) contains this fix already; perhaps we should review the branch from which the package is being created to make sure there isn't a conflict?

Dan-

Look more carefully. It does not have this fix exactly.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java'
2--- clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java 2010-02-10 02:56:14 +0000
3+++ clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java 2010-02-22 20:38:17 +0000
4@@ -352,7 +352,7 @@
5 m.put( "block-device-mapping/", "emi\nephemeral0\nroot\nswap" );
6 m.put( "block-device-mapping/emi", "sda1" );
7 m.put( "block-device-mapping/ami", "sda1" );
8- m.put( "block-device-mapping/ephemeral", "sda2" );
9+ m.put( "block-device-mapping/ephemeral0", "sda2" );
10 m.put( "block-device-mapping/swap", "sda3" );
11 m.put( "block-device-mapping/root", "/dev/sda1" );
12

Subscribers

People subscribed via source and target branches