← Back to branch summary

~ubuntu-virt/ubuntu/maverick/eucalyptus/2.0

~ubuntu-virt/ubuntu/maverick/eucalyptus/2.0

Viewing all changes in revision 1050.2.2.

Committer: Dave Walker (Daviey)
Date: 2010-07-01 16:35:31 UTC
mfrom: (444.79.4 upstream)
mto: (1050.1.12 devel)
mto: This revision was merged to the branch mainline in revision 1051.
Revision ID: davewalker@ubuntu.com-20100701163531-dgrstjas80e6rhid

Merged from upstream -r1203

files modified:
clc/build.xml

clc/modules/bootstrap/eucalyptus-bootstrap.h

clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBootstrapper.java

clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java

clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/ZoneManager.java

clc/modules/dns/src/main/java/com/eucalyptus/dns/TransientZone.java

clc/modules/module-inc.xml

clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java

clc/modules/www/conf/www/admin.xml

clc/modules/www/src/main/resources/eucalyptus-jetty.xml

node/handlers.c

node/handlers.h

node/handlers_kvm.c

node/handlers_xen.c

tools/gen_kvm_libvirt_xml

util/data.c

util/data.h

util/eucalyptus.h

Show diffs side-by-side

added added

removed removed

clc/modules/bootstrap/eucalyptus-bootstrap.h

clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBootstrapper.java

clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java

clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/ZoneManager.java

clc/modules/dns/src/main/java/com/eucalyptus/dns/TransientZone.java

clc/modules/module-inc.xml

clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java

clc/modules/www/conf/www/admin.xml

clc/modules/www/src/main/resources/eucalyptus-jetty.xml

node/handlers.c

node/handlers.h

node/handlers_kvm.c

node/handlers_xen.c

tools/gen_kvm_libvirt_xml

util/eucalyptus.h

Older »