← Back to branch summary

~james-page/ubuntu/oneiric/eucalyptus/google-fix

« back to all changes in this revision

Viewing changes to .pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey), Dave Walker (Daviey), Scott Moser
  • Date: 2010-08-11 13:46:50 UTC
  • mfrom: (1.1.40 upstream)
  • Revision ID: james.westby@ubuntu.com-20100811134650-m7ltdeev7ne7glt8
Tags: 2.0~bzr1224-0ubuntu1
https://launchpad.net/bugs/610259
https://launchpad.net/bugs/609112
https://launchpad.net/bugs/613033
https://launchpad.net/bugs/614503
https://launchpad.net/bugs/615529
https://launchpad.net/bugs/613463
[ Dave Walker (Daviey) ]
* New upstream merge, r1224, should fix LP: #610259, #609112, #613033
* debian/patches/10-disable-iscsi.patch: Removed, we should now be 
  supporting iscsi.
* debian/control: Promoted tgt from Recommends to Depends for 
  eucalyptus-sc. (LP: #614503)

[ Scott Moser ]
* work around kvm virtio bug with -kernel by using boot floppy LP: #615529
* remove the listing of dependency on grub-pc for workaround. LP: #613463

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java
107
107
  private final String                                instanceId;
108
108
  private final String                                ownerId;
109
109
  private final String                                placement;
110
 
  private final String                                userData;
 
110
  private final byte[]                                userData;
111
111
  private final List<Network>                         networks      = Lists.newArrayList( );
112
112
  private final NetworkConfigType                     networkConfig = new NetworkConfigType( );
113
113
  private VmImageInfo                                 imageInfo;
127
127
  private Boolean                                     privateNetwork;
128
128
  
129
129
  public VmInstance( final String reservationId, final int launchIndex, final String instanceId, final String ownerId, final String placement,
130
 
                     final String userData, final VmImageInfo imageInfo, final VmKeyInfo keyInfo, final VmTypeInfo vmTypeInfo, final List<Network> networks,
 
130
                     final byte[] userData, final VmImageInfo imageInfo, final VmKeyInfo keyInfo, final VmTypeInfo vmTypeInfo, final List<Network> networks,
131
131
                     final String networkIndex ) {
132
132
    this.reservationId = reservationId;
133
133
    this.launchIndex = launchIndex;
434
434
    return launchTime;
435
435
  }
436
436
  
437
 
  public String getUserData( ) {
 
437
  public byte[] getUserData( ) {
438
438
    return userData;
439
439
  }
440
440