← Back to branch summary

~ubuntu-branches/ubuntu/vivid/eucalyptus/vivid

« back to all changes in this revision

Viewing changes to clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ClusterAllocator.java

  • Committer: Bazaar Package Importer
  • Author(s): James Page
  • Date: 2011-05-18 10:46:58 UTC
  • Revision ID: james.westby@ubuntu.com-20110518104658-umi4lvp0yqtu8cl9
Tags: 2.0.1+bzr1256-0ubuntu5
https://launchpad.net/bugs/784491
* Fix FTBFS against libgoogle-collections-java 1.0 (LP: #784491). 
  - debian/patches/26-google-collections-1.0-ftbfs.patch: refactoring
    to use 1.0 API.
* Fix libjibx-java to version 1.1 to allow entry of libjibx1.2-java 
  into universe without breaking eucalyptus:
  - debian/eucalyptus-java-common.links: use jibx-*-1.1.jar.
  - debian/build-jars: use jibx-*-1.1.jar.
  - debian/control: use libjibx1.1-java instead of libjibx-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ClusterAllocator.java
285
285
    if ( primaryNet != null ) {
286
286
      vlan = primaryNet.getVlan( );
287
287
      networkNames = Lists.newArrayList( primaryNet.getNetworkName( ) );
288
 
      netIndexes = Lists.newArrayList( Iterables.transform( primaryNet.getIndexes( ), Functions.TO_STRING ) );
 
288
      netIndexes = Lists.newArrayList( Iterables.transform( primaryNet.getIndexes( ), Functions.toStringFunction() ) );
289
289
    } else {
290
290
      vlan = -1;
291
291
      networkNames = Lists.newArrayList( "default" );