~ubuntu-branches/ubuntu/natty/eucalyptus/natty-proposed

« back to all changes in this revision

Viewing changes to clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/SystemState.java

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland
  • Date: 2010-08-18 15:43:14 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20100818154314-lth6atzhw3q1b952
Tags: 2.0~bzr1232-0ubuntu1
* New upstream snapshot, -r1232, bugs fixed by upstream:
  - LP: #610479 - remove spurious state update causing network index reuse
  - LP: #613033 - fix url patterns for installed but unused remote components

Show diffs side-by-side

added added

removed removed

Lines of Context:
212
212
        Network network = Networks.getInstance( ).lookup( runVm.getOwnerId( ) + "-" + runVm.getGroupNames( ).get( 0 ) );
213
213
        network.extantNetworkIndex( vm.getPlacement( ), vm.getNetworkIndex( ) );
214
214
      } catch ( Exception e ) {}
215
 
    } else {
216
 
      vm.setState( VmState.Mapper.get( runVm.getStateName( ) ), Reason.APPEND, "UPDATE" );
217
215
    }
218
216
  }
219
217
  @Deprecated /** TODO: HACK HACK **/