← Back to branch summary

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

« back to all changes in this revision

Viewing changes to clc/modules/msgs/src/main/java/com/eucalyptus/component/DatabaseServiceBuilder.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:
clc/modules/msgs/src/main/java/com/eucalyptus/component/DatabaseServiceBuilder.java
71
71
  }
72
72
 
73
73
  @Override
74
 
  public ServiceConfiguration add( URI uri ) throws ServiceRegistrationException {
 
74
  public ServiceConfiguration toConfiguration( URI uri ) throws ServiceRegistrationException {
75
75
    try {
76
76
      if( "vm".equals( uri.getScheme( ) ) || NetworkUtil.testLocal( uri.getHost( ) ) ) {
77
77
        return new LocalConfiguration( this.getComponent( ).getPeer( ), uri );