Merge lp://qastaging/~kirkland/eucalyptus/powernap-fix into lp://qastaging/eucalyptus/1.5
Status: | Rejected |
---|---|
Rejected by: | Daniel Nurmi |
Proposed branch: | lp://qastaging/~kirkland/eucalyptus/powernap-fix |
Merge into: | lp://qastaging/eucalyptus/1.5 |
Diff against target: |
146095 lines (+114810/-19216) (has conflicts) 854 files modified
.bzrignore (+28/-1) CHANGELOG (+80/-0) INSTALL (+207/-11) Makedefs.in (+8/-4) Makefile (+18/-36) README (+29/-27) VERSION (+1/-1) clc/.classpath (+119/-0) clc/.project (+33/-0) clc/.settings/org.codehaus.groovy.eclipse.preferences.prefs (+4/-0) clc/.settings/org.eclipse.jdt.core.prefs (+13/-0) clc/.settings/org.eclipse.jdt.launching.prefs (+3/-0) clc/Makefile (+47/-4) clc/build.xml (+252/-182) clc/modules/authentication/build.xml (+70/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialEntities.groovy (+231/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialProvider.java (+347/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/Credentials.java (+107/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/NoSuchUserException.java (+88/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java (+120/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/SystemCredentialProvider.java (+195/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/UserExistsException.java (+84/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/AbstractKeyStore.java (+208/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/EucaKeyStore.java (+115/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/Hashes.java (+267/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/KeyTool.java (+156/-0) clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/SslSetup.java (+212/-0) clc/modules/authentication/src/main/resources/ehcache-auth.xml (+68/-0) clc/modules/axis2-transport/resources/META-INF/spring.handlers (+0/-1) clc/modules/axis2-transport/resources/META-INF/spring.schemas (+0/-1) clc/modules/bootstrap/Makefile (+58/-0) clc/modules/bootstrap/arguments.ggo (+49/-0) clc/modules/bootstrap/eucalyptus-bootstrap.c (+643/-0) clc/modules/bootstrap/eucalyptus-bootstrap.h (+152/-0) clc/modules/bootstrap/eucalyptus-opts.c (+1649/-0) clc/modules/bootstrap/eucalyptus-opts.h (+303/-0) clc/modules/cloud/build.xml (+71/-0) clc/modules/cloud/src/main/resources/com.eucalyptus.CloudServiceProvider (+7/-0) clc/modules/cloud/src/main/resources/eucalyptus-cloud-model.xml (+71/-0) clc/modules/cloud/src/main/resources/eucalyptus-cloud-services.xml (+76/-0) clc/modules/cloud/src/main/resources/eucalyptus-interface.xml (+151/-0) clc/modules/cloud/src/main/resources/eucalyptus-mule.xml (+107/-0) clc/modules/cloud/src/main/resources/eucalyptus-runtime.xml (+184/-0) clc/modules/cloud/src/main/resources/eucalyptus-services.xml (+102/-0) clc/modules/cloud/src/main/resources/eucalyptus-storage.xml (+115/-0) clc/modules/cloud/src/main/resources/eucalyptus-userdata.xml (+106/-0) clc/modules/cloud/src/main/resources/eucalyptus-verification.xml (+153/-0) clc/modules/cluster-manager/build.xml (+70/-16) clc/modules/cluster-manager/cluster-manager.iml (+27/-0) clc/modules/cluster-manager/conf/rules/describe/instances.drl (+0/-11) clc/modules/cluster-manager/conf/rules/describe/state-update.drl (+0/-14) clc/modules/cluster-manager/conf/scripts/LeastFullFirst.groovy (+34/-0) clc/modules/cluster-manager/conf/scripts/vmstate.groovy (+12/-0) clc/modules/cluster-manager/pom.xml (+67/-1) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java (+188/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java (+466/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressCategory.java (+35/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Addresses.java (+298/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/DynamicSystemAddressManager.java (+75/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/NullSystemAddressManager.java (+42/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/StaticSystemAddressManager.java (+95/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Callback.java (+8/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java (+287/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBootstrapper.java (+224/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterMessageQueue.java (+144/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterNodeState.java (+231/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterState.java (+262/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterThreadGroup.java (+107/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java (+159/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/FailureCallback.java (+8/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Networks.java (+30/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/SuccessCallback.java (+9/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/UnconditionalCallback.java (+18/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/event/ClusterEvents.groovy (+10/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/AbstractClusterMessageDispatcher.java (+279/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/AddressStateHandler.java (+95/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/ClusterCertificateHandler.java (+100/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/LogStateHandler.java (+31/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/NetworkStateHandler.java (+98/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/ResourceStateHandler.java (+60/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/VmStateHandler.java (+82/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/util/ClusterUtil.java (+86/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/net/util/ClusterAddressInfo.groovy (+41/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/AddressAllocator.groovy (+41/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ClusterAllocator.java (+309/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/NodeResourceAllocator.java (+60/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/PrivateNetworkAllocator.groovy (+44/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ResourceAllocator.java (+12/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/SubnetIndexAllocator.groovy (+39/-0) clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/VmAdmissionControl.java (+150/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/AssignAddressCallback.java (+166/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ClusterEndpoint.java (+294/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ClusterEnvelope.java (+105/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ConfigureNetworkCallback.java (+102/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ConsoleOutputCallback.java (+112/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/EucalyptusWSException.java (+90/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/MultiClusterCallback.java (+36/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/NetworkAlreadyExistsException.java (+68/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/NoSuchTokenException.java (+68/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/QueuedEvent.java (+128/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/QueuedEventCallback.java (+249/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/QueuedLogEvent.java (+74/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/RebootCallback.java (+93/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/Reservation.java (+181/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/Reservations.java (+106/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/StartNetworkCallback.java (+127/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/StopNetworkCallback.java (+124/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/TerminateCallback.java (+99/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/UnassignAddressCallback.groovy (+149/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java (+439/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstances.java (+156/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmRunCallback.java (+170/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypeAvailability.java (+166/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypeVerify.java (+91/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypes.java (+152/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VolumeAttachCallback.java (+117/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VolumeDetachCallback.java (+103/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/AddressManager.java (+252/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CreateVmInstances.java (+118/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SystemState.java (+489/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VmControl.java (+131/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VmMetadata.java (+89/-0) clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VmReplyTransform.java (+97/-0) clc/modules/configuration/build.xml (+70/-0) clc/modules/configuration/conf/scripts/describe_nodes.groovy (+24/-0) clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.java (+331/-0) clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationEntities.groovy (+295/-0) clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationUtil.java (+181/-0) clc/modules/configuration/src/main/java/com/eucalyptus/config/NoSuchComponentException.java (+23/-0) clc/modules/configuration/src/main/java/com/eucalyptus/event/ComponentEvent.java (+38/-0) clc/modules/configuration/src/main/java/com/eucalyptus/event/StartComponentEvent.java (+41/-0) clc/modules/configuration/src/main/java/com/eucalyptus/event/StopComponentEvent.java (+31/-0) clc/modules/configuration/src/main/resources/com.eucalyptus.CloudServiceProvider (+2/-0) clc/modules/configuration/src/main/resources/ehcache-config.xml (+68/-0) clc/modules/configuration/src/main/resources/eucalyptus-configuration.xml (+88/-0) clc/modules/core/build.xml (+71/-0) clc/modules/core/conf/scripts/Import_150.groovy (+561/-0) clc/modules/core/conf/scripts/Import_152.groovy (+584/-0) clc/modules/core/conf/scripts/Import_161.groovy (+126/-0) clc/modules/core/core.iml (+19/-0) clc/modules/core/pom.xml (+66/-0) clc/modules/core/src/main/java/com/eucalyptus/bootstrap/RemoteDatabaseBootstrapper.java (+102/-0) clc/modules/core/src/main/java/com/eucalyptus/event/SystemConfigurationEvent.java (+11/-0) clc/modules/core/src/main/java/com/eucalyptus/util/DNSProperties.java (+97/-0) clc/modules/core/src/main/java/com/eucalyptus/util/NotEnoughResourcesAvailable.java (+81/-0) clc/modules/core/src/main/java/com/eucalyptus/util/StorageProperties.java (+170/-0) clc/modules/core/src/main/java/com/eucalyptus/util/WalrusProperties.java (+235/-0) clc/modules/core/src/main/java/com/eucalyptus/util/WalrusUtil.java (+122/-0) clc/modules/core/src/main/java/com/eucalyptus/ws/util/Messaging.java (+114/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/StartupChecks.java (+250/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/AccessDeniedException.java (+100/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/BucketAlreadyExistsException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/BucketAlreadyOwnedByYouException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/BucketNotEmptyException.java (+97/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/DecryptionFailedException.java (+92/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/EntityAlreadyExistsException.java (+94/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/EntityTooLargeException.java (+101/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/EucalyptusInvalidRequestException.java (+90/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/ImageAlreadyExistsException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/InlineDataTooLargeException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/InvalidArgumentException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/InvalidRangeException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/InvalidTargetBucketForLoggingException.java (+93/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchBucketException.java (+93/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchEntityException.java (+93/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchSnapshotException.java (+95/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchVolumeException.java (+94/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NotAuthorizedException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NotImplementedException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NotModifiedException.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NotReadyException.java (+90/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/PreconditionFailedException.java (+98/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/SnapshotInUseException.java (+95/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/TooManyBucketsException.java (+92/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeAlreadyExistsException.java (+94/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeInUseException.java (+94/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeNotReadyException.java (+94/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/WalrusException.java (+143/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEMetaInfo.java (+104/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEVolumeInfo.java (+111/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ARecordInfo.java (+163/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AttachedVolumeInfo.java (+132/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/BucketInfo.java (+514/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CNAMERecordInfo.java (+165/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CertificateInfo.java (+125/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ClusterInfo.java (+226/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/Counters.java (+169/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/GrantInfo.java (+236/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIMetaInfo.java (+124/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIVolumeInfo.java (+129/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImageCacheInfo.java (+200/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImageInfo.java (+357/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImagePermissionInfo.java (+117/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMMetaInfo.java (+128/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java (+229/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/MetaDataInfo.java (+162/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/NSRecordInfo.java (+166/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ObjectInfo.java (+517/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ProductCode.java (+120/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SOARecordInfo.java (+226/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SnapshotInfo.java (+208/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageInfo.java (+206/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageStatsInfo.java (+155/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java (+240/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/TorrentInfo.java (+157/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/UserGroupInfo.java (+158/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/UserInfo.java (+334/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/VmType.java (+214/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/VolumeInfo.java (+204/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java (+185/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusSnapshotInfo.java (+142/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusStatsInfo.java (+149/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ZoneInfo.java (+121/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/exceptions/ExceptionList.java (+114/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/AbstractIsomorph.java (+136/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/AlreadyExistsException.java (+72/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/DoesNotExistException.java (+72/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/State.java (+68/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/WeakInteraction.java (+107/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/Admin.java (+125/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/CaseInsensitiveMap.java (+146/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ErrorFactory.java (+96/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphore.java (+88/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphoreDirectory.java (+103/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucalyptusProperties.java (+261/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ReplyCoordinator.java (+157/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/StreamConsumer.java (+119/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/SystemUtil.java (+103/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/UserManagement.java (+150/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusDataMessage.java (+162/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusDataMessenger.java (+131/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusDataQueue.java (+88/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusMonitor.java (+91/-0) clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/XMLParser.java (+230/-0) clc/modules/core/src/main/java/org/hsqldb/HsqlSocketFactorySecure.java (+94/-0) clc/modules/core/src/main/resources/ehcache.xml (+68/-0) clc/modules/core/src/main/resources/log4j.xml (+214/-0) clc/modules/crypto/src/javax/crypto/BadPaddingException.java (+0/-60) clc/modules/crypto/src/javax/crypto/Cipher.java (+0/-2258) clc/modules/crypto/src/javax/crypto/CipherInputStream.java (+0/-322) clc/modules/crypto/src/javax/crypto/CipherOutputStream.java (+0/-213) clc/modules/crypto/src/javax/crypto/CipherSpi.java (+0/-895) clc/modules/crypto/src/javax/crypto/CryptoAllPermission.java (+0/-179) clc/modules/crypto/src/javax/crypto/CryptoPermission.java (+0/-545) clc/modules/crypto/src/javax/crypto/CryptoPermissions.java (+0/-479) clc/modules/crypto/src/javax/crypto/CryptoPolicyParser.java (+0/-707) clc/modules/crypto/src/javax/crypto/EncryptedPrivateKeyInfo.java (+0/-448) clc/modules/crypto/src/javax/crypto/ExemptionMechanism.java (+0/-486) clc/modules/crypto/src/javax/crypto/ExemptionMechanismException.java (+0/-59) clc/modules/crypto/src/javax/crypto/ExemptionMechanismSpi.java (+0/-170) clc/modules/crypto/src/javax/crypto/IllegalBlockSizeException.java (+0/-60) clc/modules/crypto/src/javax/crypto/JceSecurity.java (+0/-92) clc/modules/crypto/src/javax/crypto/KeyAgreement.java (+0/-625) clc/modules/crypto/src/javax/crypto/KeyAgreementSpi.java (+0/-204) clc/modules/crypto/src/javax/crypto/KeyGenerator.java (+0/-526) clc/modules/crypto/src/javax/crypto/KeyGeneratorSpi.java (+0/-86) clc/modules/crypto/src/javax/crypto/Mac.java (+0/-643) clc/modules/crypto/src/javax/crypto/MacSpi.java (+0/-153) clc/modules/crypto/src/javax/crypto/NoSuchPaddingException.java (+0/-61) clc/modules/crypto/src/javax/crypto/NullCipher.java (+0/-44) clc/modules/crypto/src/javax/crypto/NullCipherSpi.java (+0/-113) clc/modules/crypto/src/javax/crypto/SealedObject.java (+0/-497) clc/modules/crypto/src/javax/crypto/SecretKey.java (+0/-58) clc/modules/crypto/src/javax/crypto/SecretKeyFactory.java (+0/-415) clc/modules/crypto/src/javax/crypto/SecretKeyFactorySpi.java (+0/-108) clc/modules/crypto/src/javax/crypto/ShortBufferException.java (+0/-61) clc/modules/database/build.xml (+71/-0) clc/modules/database/conf/scripts/after_database.groovy (+37/-0) clc/modules/database/conf/scripts/after_persistence.groovy (+3/-0) clc/modules/database/conf/scripts/before_database.groovy (+19/-0) clc/modules/database/conf/scripts/caches.groovy (+8/-0) clc/modules/database/conf/scripts/entities.groovy (+33/-0) clc/modules/database/conf/scripts/pools.groovy (+30/-0) clc/modules/database/src/main/java/com/eucalyptus/bootstrap/DatabaseConfig.java (+109/-0) clc/modules/database/src/main/java/com/eucalyptus/bootstrap/LocalDatabaseBootstrapper.java (+247/-0) clc/modules/database/src/main/java/com/eucalyptus/util/DatabaseUtil.java (+109/-0) clc/modules/database/src/main/java/com/eucalyptus/util/EntityWrapper.java (+233/-0) clc/modules/database/src/main/java/com/eucalyptus/util/TxHandle.java (+198/-0) clc/modules/distribution/bin-assembly.xml (+65/-0) clc/modules/distribution/distribution.iml (+49/-0) clc/modules/distribution/lib-assembly.xml (+65/-0) clc/modules/distribution/modules-assembly.xml (+65/-0) clc/modules/distribution/pom.xml (+205/-0) clc/modules/dns/build.xml (+68/-0) clc/modules/dns/dns.iml (+18/-0) clc/modules/dns/src/main/java/com/eucalyptus/bootstrap/DNSBootstrapper.java (+117/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/ConnectionHandler.java (+474/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/ConnectionHandlerFactory.java (+81/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java (+327/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPHandler.java (+115/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPListener.java (+110/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/UDPHandler.java (+136/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/UDPListener.java (+97/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/ZoneManager.java (+306/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/tests/DNSControlTest.java (+92/-0) clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/tests/RemoveARecordTest.java (+89/-0) clc/modules/dns/src/main/java/com/eucalyptus/dns/Cache.java (+928/-0) clc/modules/dns/src/main/java/com/eucalyptus/dns/SetResponse.java (+276/-0) clc/modules/dns/src/main/java/com/eucalyptus/dns/TransientZone.java (+178/-0) clc/modules/dns/src/main/java/com/eucalyptus/dns/Zone.java (+630/-0) clc/modules/dns/src/main/java/com/eucalyptus/ic/DNS.java (+101/-0) clc/modules/dns/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0) clc/modules/dns/src/main/resources/dns-model.xml (+130/-0) clc/modules/dns/src/main/resources/dns-services.xml (+88/-0) clc/modules/group-manager/build.xml (+65/-15) clc/modules/group-manager/group-manager.iml (+26/-0) clc/modules/group-manager/pom.xml (+66/-0) clc/modules/group-manager/security-groups-manager.iml (+104/-0) clc/modules/group-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java (+186/-0) clc/modules/group-manager/src/main/java/com/eucalyptus/network/NetworkGroupUtil.java (+210/-0) clc/modules/image-manager/build.xml (+65/-15) clc/modules/image-manager/image-manager.iml (+35/-0) clc/modules/image-manager/pom.xml (+66/-0) clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/ImageUtil.java (+481/-0) clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/StorageUtil.java (+124/-0) clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/WalrusUtil.java (+204/-0) clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/state/Snapshot.java (+155/-0) clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/state/Volume.java (+188/-0) clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ImageManager.java (+522/-0) clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SnapshotManager.java (+206/-0) clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VolumeManager.java (+363/-0) clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/XMLParserTest.java (+92/-0) clc/modules/image-manager/src/main/resources/ehcache-volumes.xml (+68/-0) clc/modules/interface/build.xml (+65/-15) clc/modules/interface/interface.iml (+21/-0) clc/modules/interface/pom.xml (+67/-1) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/DNSReplyQueue.java (+118/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/DNSRequestQueue.java (+78/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/Eucalyptus.java (+106/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java (+151/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/StorageRequestQueue.java (+78/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/WalrusMessaging.java (+120/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java (+124/-0) clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/WalrusRequestQueue.java (+78/-0) clc/modules/key-manager/build.xml (+65/-15) clc/modules/key-manager/key-manager.iml (+20/-0) clc/modules/key-manager/pom.xml (+66/-0) clc/modules/key-manager/src/main/java/com/eucalyptus/keys/KeyPairManager.java (+101/-0) clc/modules/key-manager/src/main/java/com/eucalyptus/keys/KeyPairUtil.java (+127/-0) clc/modules/module-inc.xml (+171/-74) clc/modules/msgs/build.xml (+99/-0) clc/modules/msgs/conf/scripts/startup.groovy (+77/-0) clc/modules/msgs/msgs.iml (+23/-0) clc/modules/msgs/pom.xml (+66/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapFactory.java (+183/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java (+115/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Component.java (+246/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DatabaseBootstrapper.java (+7/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DeferredInitializer.java (+116/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Depends.java (+77/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/NeedsDeferredInitialization.java (+75/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Provides.java (+76/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Resource.java (+166/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ResourceProvider.java (+151/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceBootstrapper.java (+152/-0) clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java (+238/-0) clc/modules/msgs/src/main/java/com/eucalyptus/entities/BaseEntities.groovy (+400/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java (+288/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/ClockTick.java (+41/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/Event.java (+40/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListener.java (+7/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/EventVetoedException.java (+21/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/GenericEvent.java (+29/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/ListenerRegistry.java (+79/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/ReentrantListenerRegistry.java (+89/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/StateEvent.java (+20/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java (+207/-0) clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java (+55/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/BaseDirectory.java (+102/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/DebugUtil.java (+180/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/EucaLayout.java (+136/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusCloudException.java (+83/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusClusterException.java (+21/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusProperties.java (+99/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/ExceptionNotRelatedException.java (+21/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/ExecutionException.java (+86/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/FailScriptFailException.java (+87/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/GenerateJiBXBinding.java (+238/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/GroovyUtil.java (+101/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java (+70/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/HoldMe.java (+199/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy (+38/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/NetworkUtil.java (+159/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/ServiceJarFile.java (+190/-0) clc/modules/msgs/src/main/java/com/eucalyptus/util/SubDirectory.java (+96/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/annotation/HttpBinding.java (+77/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/annotation/HttpEmbedded.java (+77/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/annotation/HttpParameterMapping.java (+78/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/BucketLogData.java (+219/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy (+651/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/EventType.java (+90/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/IsData.java (+68/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/VmState.java (+109/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Configuration.groovy (+158/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/DNS.groovy (+167/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/EventRecord.java (+102/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy (+573/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/StorageController.groovy (+319/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Unimplemented.groovy (+85/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VPN.groovy (+223/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmAddresses.groovy (+137/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmBlockDevice.groovy (+215/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmControl.groovy (+263/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmImages.groovy (+258/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmKeys.groovy (+105/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmLocation.groovy (+104/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmNetwork.groovy (+216/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmSecurity.groovy (+157/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Walrus.groovy (+778/-0) clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/util/BindingUtil.java (+79/-0) clc/modules/msgs/src/main/java/org/apache/tools/ant/util/DateUtils.java (+340/-0) clc/modules/msgs/src/main/resources/2006-06-26-binding.xml (+73/-0) clc/modules/msgs/src/main/resources/2006-10-01-binding.xml (+73/-0) clc/modules/msgs/src/main/resources/2007-01-03-binding.xml (+73/-0) clc/modules/msgs/src/main/resources/2007-01-19-binding.xml (+73/-0) clc/modules/msgs/src/main/resources/2007-03-01-binding.xml (+74/-0) clc/modules/msgs/src/main/resources/2007-08-29-binding.xml (+77/-0) clc/modules/msgs/src/main/resources/2008-02-01-binding.xml (+77/-0) clc/modules/msgs/src/main/resources/2008-05-05-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/2008-08-08-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/2008-12-01-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/2009-03-01-binding.xml (+78/-0) clc/modules/msgs/src/main/resources/2009-04-04-binding.xml (+78/-0) clc/modules/msgs/src/main/resources/2009-07-15-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/2009-08-15-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/2009-10-31-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/2009-11-30-binding.xml (+79/-0) clc/modules/msgs/src/main/resources/CC-binding.xml (+96/-0) clc/modules/msgs/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory (+1/-0) clc/modules/msgs/src/main/resources/aws-base.xml (+70/-0) clc/modules/msgs/src/main/resources/aws-ebs-snapshots-09-08-15.xml (+128/-0) clc/modules/msgs/src/main/resources/aws-ebs-snapshots.xml (+114/-0) clc/modules/msgs/src/main/resources/aws-ebs-volumes.xml (+144/-0) clc/modules/msgs/src/main/resources/aws-image-attr.xml (+173/-0) clc/modules/msgs/src/main/resources/aws-images-09-10-31.xml (+174/-0) clc/modules/msgs/src/main/resources/aws-images.xml (+158/-0) clc/modules/msgs/src/main/resources/aws-instances-09-10-31.xml (+242/-0) clc/modules/msgs/src/main/resources/aws-instances.xml (+240/-0) clc/modules/msgs/src/main/resources/aws-ips.xml (+133/-0) clc/modules/msgs/src/main/resources/aws-keypairs.xml (+116/-0) clc/modules/msgs/src/main/resources/aws-null-base.xml (+68/-0) clc/modules/msgs/src/main/resources/aws-regions.xml (+86/-0) clc/modules/msgs/src/main/resources/aws-security.xml (+174/-0) clc/modules/msgs/src/main/resources/aws-unimplemented.xml (+113/-0) clc/modules/msgs/src/main/resources/aws-vpc.xml (+66/-0) clc/modules/msgs/src/main/resources/aws-zones-09-07-15.xml (+94/-0) clc/modules/msgs/src/main/resources/aws-zones.xml (+86/-0) clc/modules/msgs/src/main/resources/cc-getlogs.xml (+103/-0) clc/modules/msgs/src/main/resources/cc-network.xml (+149/-0) clc/modules/msgs/src/main/resources/cc-resources.xml (+85/-0) clc/modules/msgs/src/main/resources/cc-types.xml (+193/-0) clc/modules/msgs/src/main/resources/cc-vms.xml (+160/-0) clc/modules/msgs/src/main/resources/com.eucalyptus.CloudServiceProvider (+2/-0) clc/modules/msgs/src/main/resources/eucalyptus-bootstrap.xml (+115/-0) clc/modules/msgs/src/main/resources/s3-2006-03-01-binding.xml (+628/-0) clc/modules/msgs/src/main/resources/storage-controller-binding.xml (+171/-0) clc/modules/storage-common/build.xml (+68/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java (+77/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java (+120/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java (+127/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileIO.java (+83/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java (+110/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java (+448/-0) clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java (+108/-0) clc/modules/storage-controller/build.xml (+69/-17) clc/modules/storage-controller/native/Makefile (+11/-4) clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_AOEManager.c (+7/-0) clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_LVM2Manager.c (+60/-433) clc/modules/storage-controller/native/liblvm2control.iml (+124/-0) clc/modules/storage-controller/native/pom.xml (+66/-0) clc/modules/storage-controller/pom.xml (+68/-6) clc/modules/storage-controller/src/main/java/com/eucalyptus/bootstrap/BlockStorageBootstrapper.java (+113/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorage.java (+870/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorageStatistics.java (+140/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CallBack.java (+9/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/HttpReader.java (+138/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/HttpTransfer.java (+72/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/HttpWriter.java (+64/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/PutMethodWithProgress.java (+69/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SnapshotProgressCallback.java (+74/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SnapshotService.java (+83/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/StorageEventListener.java (+119/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VolumeService.java (+83/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateSnapshotTest.java (+140/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateVolumeFromSnapshotTest.java (+110/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/DeleteSnapshotTest.java (+101/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/StorageTests.java (+81/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/VolumeTest.java (+110/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/ic/StorageController.java (+105/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/AOEManager.java (+185/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/BlockStorageChecker.java (+315/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/BlockStorageManagerFactory.java (+72/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/ISCSIManager.java (+213/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LVM2Manager.java (+1082/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LogicalStorageManager.java (+114/-0) clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/StorageExportManager.java (+83/-0) clc/modules/storage-controller/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0) clc/modules/storage-controller/src/main/resources/storage-model.xml (+130/-0) clc/modules/storage-controller/src/main/resources/storage-services.xml (+89/-0) clc/modules/storage-controller/storage-controller.iml (+23/-0) clc/modules/storage-manager/native/Makefile (+0/-21) clc/modules/walrus/build.xml (+68/-0) clc/modules/walrus/pom.xml (+146/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ObjectReader.java (+180/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/TorrentClient.java (+107/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/TorrentCreator.java (+148/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/Torrents.java (+92/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/Tracker.java (+133/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusBlockStorageManager.java (+321/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusControl.java (+399/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusEventListener.java (+110/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusImageManager.java (+1094/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java (+2108/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusStatistics.java (+157/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/BukkitImageTest.java (+97/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/BukkitTest.java (+114/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/ImageCacheTest.java (+120/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/ObjectTest.java (+150/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/WalrusBucketTests.java (+83/-0) clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/ic/Walrus.java (+100/-0) clc/modules/walrus/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0) clc/modules/walrus/src/main/resources/walrus-model.xml (+131/-0) clc/modules/walrus/src/main/resources/walrus-services.xml (+87/-0) clc/modules/walrus/storage-manager.iml (+19/-0) clc/modules/workarounds/src/java/util/concurrent/LinkedBlockingQueue.java (+0/-810) clc/modules/wsstack/build.xml (+68/-0) clc/modules/wsstack/conf/scripts/channels.groovy (+55/-0) clc/modules/wsstack/pom.xml (+222/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/AuthenticationException.java (+87/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/BindingException.java (+84/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/EucalyptusNamespaceHandler.java (+80/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/EucalyptusRemoteFault.java (+80/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/HttpException.java (+88/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/InvalidOperationException.java (+87/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MappingHttpMessage.java (+147/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MappingHttpRequest.java (+195/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MappingHttpResponse.java (+98/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/RemoteConfigurationException.java (+84/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceDispatchBootstrapper.java (+194/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceVerifyBootstrapper.java (+47/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/TestBasicHttpNioClient.java (+85/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/WebServicesException.java (+117/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/binding/Binding.java (+403/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/binding/BindingManager.java (+89/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/Client.java (+82/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/HeartbeatClient.java (+115/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/LocalDispatcher.java (+55/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioBootstrap.java (+194/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioClient.java (+141/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageAdapter.java (+103/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageDispatcher.java (+127/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageDispatcherFactory.java (+101/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageReceiver.java (+107/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteBootstrapperClient.java (+279/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteDispatcher.java (+119/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java (+108/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/ServiceEventListener.java (+68/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/ClusterClientPipeline.java (+101/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java (+86/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/LogClientPipeline.java (+98/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/NioClientPipeline.java (+135/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java (+145/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java (+81/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/EucalyptusQueryBinding.java (+262/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/HeartbeatHandler.java (+355/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/HmacV2Handler.java (+187/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java (+135/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioHttpResponseDecoder.java (+80/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioResponseHandler.java (+206/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/POSTRequestContext.java (+97/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java (+129/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java (+153/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ServiceSinkHandler.java (+237/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/SoapMarshallingHandler.java (+139/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/TestHandler.java (+160/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusAuthenticationHandler.java (+373/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusOutboundHandler.java (+139/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusPOSTAuthenticationHandler.java (+540/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusPOSTIncomingHandler.java (+163/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTBinding.java (+1175/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTLoggerInbound.java (+123/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTLoggerOutbound.java (+123/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusSoapHandler.java (+222/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusSoapUserAuthenticationHandler.java (+188/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java (+536/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpRequestEncoder.java (+89/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/http/NioSslHandler.java (+37/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/soap/AddressingHandler.java (+132/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/soap/SoapHandler.java (+151/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/ClusterWsSecHandler.java (+97/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/InternalWsSecHandler.java (+122/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/UserWsSecHandler.java (+108/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/WsSecHandler.java (+188/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/DuplicatePipelineException.java (+72/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/ElasticFoxPipeline.java (+103/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/EucalyptusQueryPipeline.java (+171/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/EucalyptusSoapPipeline.java (+94/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java (+148/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/HeartbeatPipeline.java (+99/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/InternalQueryPipeline.java (+111/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/InternalSoapPipeline.java (+102/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/MetadataPipeline.java (+84/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioHttpConnector.java (+116/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServer.java (+92/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java (+174/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServerPipelineFactory.java (+90/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NoAcceptingPipelineException.java (+87/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/RemoteBootstrapperServer.java (+150/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/WalrusRESTPipeline.java (+110/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/WalrusRESTPostPipeline.java (+110/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/WalrusSoapPipeline.java (+96/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/BindingStage.java (+85/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/ElasticFoxMangleHandler.java (+154/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/ElasticFoxMangleStage.java (+83/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/HmacV2UserAuthenticationStage.java (+99/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/QueryBindingStage.java (+83/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapInternalAuthenticationStage.java (+98/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapUserAuthenticationStage.java (+87/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/UnrollableStage.java (+138/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusOutboundStage.java (+87/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusPOSTUserAuthenticationStage.java (+89/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusRESTBindingStage.java (+89/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusSoapUserAuthenticationStage.java (+89/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusUserAuthenticationStage.java (+82/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java (+300/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java (+112/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/HmacUtils.java (+173/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/HttpUtils.java (+126/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/PipelineRegistry.java (+119/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ReplyCoordinator.java (+140/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ReplyQueue.java (+171/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/RequestQueue.java (+127/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/WSSecurity.java (+214/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/WalrusBucketLogger.java (+221/-0) clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/XMLParser.java (+214/-0) clc/modules/wsstack/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java (+108/-0) clc/modules/wsstack/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java (+69/-0) clc/modules/wsstack/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java (+391/-0) clc/modules/wsstack/src/main/resources/META-INF/euca.xsd (+79/-0) clc/modules/wsstack/src/main/resources/META-INF/services/org/mule/providers/euca.properties (+10/-0) clc/modules/wsstack/src/main/resources/META-INF/spring.handlers (+1/-0) clc/modules/wsstack/src/main/resources/META-INF/spring.schemas (+1/-0) clc/modules/www/build.xml (+146/-71) clc/modules/www/conf/eucalyptus-web-default.properties (+16/-10) clc/modules/www/conf/gwt-web.xml (+75/-0) clc/modules/www/conf/www/admin.xml (+63/-0) clc/modules/www/pom.xml (+176/-0) clc/modules/www/src/edu/ucsb/eucalyptus/admin/public/EucalyptusWebInterface.css (+0/-156) clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java (+105/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml (+90/-2) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/AppMessages.java (+60/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/CloudInfoWeb.java (+60/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ClusterInfoTable.java (+314/-118) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ClusterInfoWeb.java (+82/-39) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/DownloadsTable.java (+69/-3) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/DownloadsWeb.java (+61/-1) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusKeyboardListener.java (+60/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackend.java (+146/-70) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackendAsync.java (+136/-60) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebInterface.java (+557/-67) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/GWTUtils.java (+64/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ImageInfoWeb.java (+64/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/StorageInfoWeb.java (+206/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/SystemConfigTable.java (+196/-54) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/SystemConfigWeb.java (+131/-124) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/Theme.java (+70/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/UserInfoWeb.java (+64/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/VmTypeTable.java (+69/-3) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/VmTypeWeb.java (+60/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/WalrusInfoTable.java (+384/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/WalrusInfoWeb.java (+200/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/CancelEvent.java (+91/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/CancelHandler.java (+68/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ClearErrorEvent.java (+91/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ClearErrorHandler.java (+68/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/FrameWidget.java (+94/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/GraphicsUtil.java (+68/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/HowToRunDialog.java (+117/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageErrorDialog.java (+128/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageInfo.java (+79/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageSection.java (+72/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageSectionWidget.java (+108/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageState.java (+150/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageStoreClient.java (+137/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageStoreResponse.java (+74/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageStoreService.java (+108/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageStoreServiceAsync.java (+70/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageStoreTest.java (+78/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageStoreWidget.java (+336/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ImageWidget.java (+563/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/InstallEvent.java (+91/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/InstallHandler.java (+68/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/JSONImageInfo.java (+162/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/JSONImageSection.java (+122/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/JSONImageState.java (+137/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/JSONImageStoreResponse.java (+142/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/JSONUtil.java (+155/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/ProgressBarWidget.java (+110/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/SearchEvent.java (+96/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/SearchHandler.java (+68/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/SearchWidget.java (+136/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/extensions/store/StatusWidget.java (+306/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/EucalyptusWebInterface.html (+2/-2) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/extensions/store/stylesheet.css (+264/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/index.html.OTHER (+0/-74) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/themes/eucalyptus/code.js (+7/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/themes/eucalyptus/stylesheet.css (+211/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/themes/ubuntu/code.js (+7/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/themes/ubuntu/stylesheet.css (+242/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/BCrypt.java (+64/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusException.java (+64/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusManagement.java (+596/-13) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java (+803/-504) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/Registration.java (+102/-18) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/RemoteInfoHandler.java (+336/-50) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/ServletUtils.java (+113/-49) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/SessionInfo.java (+64/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/X509Download.java (+144/-97) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/extensions/store/ImageStoreServiceImpl.java (+213/-0) clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/extensions/store/SignatureGenerator.java (+180/-0) clc/modules/www/src/main/resources/com.eucalyptus.CloudServiceProvider (+2/-0) clc/modules/www/src/main/resources/eucalyptus-jetty.xml (+69/-0) clc/modules/www/src/main/resources/eucalyptus-www.xml (+86/-0) clc/modules/www/www.iml (+22/-0) clc/pom.xml (+80/-6) cluster/CCclient.c (+33/-3) cluster/Makefile (+21/-14) cluster/cc-client-marshal-adb.c (+104/-35) cluster/cc-client-marshal.h (+2/-1) cluster/handlers.c (+2075/-876) cluster/handlers.h (+81/-24) cluster/server-marshal.c (+174/-125) cluster/server-marshal.h (+1/-0) configure (+83/-160) configure.ac (+24/-6) debian/axis2.xml (+128/-0) debian/build-jars (+54/-0) debian/changelog (+331/-0) debian/compat (+1/-0) debian/control (+220/-0) debian/copyright (+82/-0) debian/eucalyptus-cc.dirs (+3/-0) debian/eucalyptus-cc.install (+4/-0) debian/eucalyptus-cc.postinst (+46/-0) debian/eucalyptus-cc.prerm (+13/-0) debian/eucalyptus-cloud.dirs (+3/-0) debian/eucalyptus-cloud.install (+2/-0) debian/eucalyptus-cloud.postinst (+18/-0) debian/eucalyptus-cloud.preinst (+3/-0) debian/eucalyptus-cloud.prerm (+14/-0) debian/eucalyptus-common.dirs (+1/-0) debian/eucalyptus-common.install (+13/-0) debian/eucalyptus-common.links (+3/-0) debian/eucalyptus-common.postinst (+32/-0) debian/eucalyptus-common.postrm (+10/-0) debian/eucalyptus-common.preinst (+11/-0) debian/eucalyptus-gl.install (+1/-0) debian/eucalyptus-java-common.install (+20/-0) debian/eucalyptus-java-common.links (+90/-0) debian/eucalyptus-java-common.postinst (+23/-0) debian/eucalyptus-java-common.prerm (+13/-0) debian/eucalyptus-nc.dirs (+1/-0) debian/eucalyptus-nc.install (+11/-0) debian/eucalyptus-nc.postinst (+36/-0) debian/eucalyptus-nc.prerm (+14/-0) debian/eucalyptus-sc.install (+1/-0) debian/eucalyptus-sc.postinst (+12/-0) debian/eucalyptus-sc.prerm (+14/-0) debian/eucalyptus-walrus.install (+1/-0) debian/eucalyptus-walrus.postinst (+12/-0) debian/eucalyptus-walrus.prerm (+14/-0) debian/patches/03-DESTDIR.patch (+282/-0) debian/rules (+39/-0) eucalyptus.spec (+356/-166) extras/README.monitoring (+98/-0) extras/ganglia.sh (+137/-0) extras/nagios.sh (+417/-0) gatherlog/Makefile (+8/-5) gatherlog/gl-client-marshal-adb.c (+2/-2) gatherlog/handlers.c (+32/-5) gatherlog/server-marshal.c (+6/-6) net/Makefile (+3/-0) net/vnetwork.c (+1246/-306) net/vnetwork.h (+57/-9) node/Makefile (+14/-8) node/NCclient.c (+2/-0) node/client-marshal-adb.c (+50/-2) node/client-marshal-local.c (+3/-1) node/client-marshal.h (+1/-0) node/handlers.c (+1006/-88) node/handlers.h (+151/-19) node/handlers_default.c (+376/-0) node/handlers_kvm.c (+223/-887) node/handlers_xen.c (+197/-903) node/server-marshal.c (+50/-2) node/server-marshal.h (+1/-0) roll/eucalyptus/Makefile (+0/-9) roll/eucalyptus/graphs/default/eucalyptus.xml (+0/-54) roll/eucalyptus/nodes/eucalyptus-compute.xml (+0/-137) roll/eucalyptus/nodes/eucalyptus-frontend.xml (+0/-163) roll/eucalyptus/nodes/eucalyptus.xml (+0/-57) roll/eucalyptus/src/Makefile (+0/-12) roll/eucalyptus/version.mk (+0/-4) storage/Makefile (+2/-0) storage/storage.c (+104/-37) storage/walrus.c (+34/-20) tools/Makefile (+51/-24) tools/add_key.pl (+58/-0) tools/add_marshalling.pl (+122/-59) tools/add_service_policy.pl (+59/-0) tools/add_wsdllocation.pl (+59/-0) tools/connect_iscsitarget.pl (+145/-0) tools/detach.pl (+59/-0) tools/disconnect_iscsitarget.pl (+62/-0) tools/end-to-end.sh (+59/-0) tools/euca-axis2c.spec-not (+7/-4) tools/euca-rampartc.spec-not (+10/-8) tools/euca_conf.1 (+194/-0) tools/euca_conf.complete (+6/-0) tools/euca_conf.in (+1037/-204) tools/euca_ipt (+165/-98) tools/euca_sync_key (+120/-58) tools/euca_upgrade (+279/-0) tools/euca_watchdog.pl (+123/-60) tools/eucalyptus-cc.in (+294/-68) tools/eucalyptus-cloud.in (+417/-0) tools/eucalyptus-nc.in (+145/-43) tools/eucalyptus.conf (+64/-22) tools/eucalyptus.conf.rpmbased (+0/-199) tools/gen_kvm_libvirt_xml (+125/-60) tools/gen_libvirt_xml (+124/-60) tools/get_iscsitarget.pl (+71/-0) tools/get_sys_info (+59/-0) tools/get_xen_info (+59/-0) tools/httpd.conf (+11/-1) tools/partition2disk (+99/-44) tools/populate_arp.pl (+59/-0) tools/run_axis.sh (+122/-59) tools/set_env.sh (+121/-59) tools/vtunall.conf.template (+686/-0) util/Makefile (+6/-2) util/data.c (+6/-6) util/data.h (+2/-1) util/euca_auth.c (+17/-2) util/euca_auth.h (+2/-0) util/eucalyptus-config.h.in (+6/-1) util/eucalyptus.h (+11/-11) util/ipc.c (+35/-3) util/ipc.h (+4/-0) util/misc.c (+382/-18) util/misc.h (+31/-1) util/test.c (+1/-1) wsdl/eucalyptus_cc.wsdl (+67/-0) wsdl/eucalyptus_nc.wsdl (+48/-0) Text conflict in CHANGELOG Text conflict in INSTALL Text conflict in clc/build.xml Contents conflict in clc/cloud.xml Conflict: can't delete clc/modules/axis2-transport because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/build.xml Conflict: can't delete clc/modules/axis2-transport/conf because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/conf is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/conf/axis2.xml Contents conflict in clc/modules/axis2-transport/conf/cluster-axis2.xml Contents conflict in clc/modules/axis2-transport/conf/cluster-policy.xml Contents conflict in clc/modules/axis2-transport/conf/off-policy.xml Contents conflict in clc/modules/axis2-transport/conf/policy.xml Contents conflict in clc/modules/axis2-transport/pom.xml Conflict: can't delete clc/modules/axis2-transport/resources because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/resources is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/resources/META-INF because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/resources/META-INF is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/resources/META-INF/euca.xsd Conflict: can't delete clc/modules/axis2-transport/resources/META-INF/services because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/resources/META-INF/services is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/resources/META-INF/services/org because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/resources/META-INF/services/org is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/resources/META-INF/services/org/mule because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/resources/META-INF/services/org/mule is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/resources/META-INF/services/org/mule/providers because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/resources/META-INF/services/org/mule/providers is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/resources/META-INF/services/org/mule/providers/axis2.properties Conflict: can't delete clc/modules/axis2-transport/src because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/edu because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2Connector.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2InOnlyMessageReceiver.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2InOutMessageReceiver.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2MessageAdapter.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2MessageDispatcher.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2MessageReceiver.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/OverloadedWebserviceMethod.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth/Authenticator.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth/CertAuthentication.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth/RampartCallbackHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth/RampartUsernameTokenCallbackHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/auth/UserAuthentication.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/binding because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/binding is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/binding/Binding.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/binding/BindingManager.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/Axis2MessageDispatcherFactory.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/BasicClient.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/Client.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/ClientFactory.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/ClientPool.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Axis2InProperties.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Axis2NamespaceHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Axis2OperationBuilder.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Axis2OutProperties.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Axis2Properties.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Axis2ServiceBuilder.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Key.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/config/Mep.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http/Axis2HttpListener.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http/Axis2HttpWorker.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http/Axis2HttpWorkerFactory.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http/WalrusDataFormatter.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/i18n because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/i18n is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/i18n/Axis2Messages.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/Axis2QueryDispatcher.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/DefaultQueryBinding.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/EucalyptusQuerySecurityHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/GenericHttpDispatcher.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/HMACQuerySecurityHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/HttpRequest.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/POSTRequestContext.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/QueryBinding.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/QueryBindingException.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/QuerySecurityException.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/QuerySecurityHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/RESTfulDispatcher.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/StorageQueryBinding.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/StorageQueryDispatcher.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/StorageQuerySecurityHandler.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/WalrusFileItem.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/WalrusFileItemFactory.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/WalrusQueryBinding.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/WalrusQueryDispatcher.java Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/WalrusQuerySecurityHandler.java Conflict: can't delete clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/util because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/util is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/util/Defaults.java Conflict: can't delete clc/modules/axis2-transport/src/org because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/org is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/org/apache because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/org/apache is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/org/apache/axis2 because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/org/apache/axis2 is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/org/apache/axis2/transport because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/org/apache/axis2/transport is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/org/apache/axis2/transport/http because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/org/apache/axis2/transport/http is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/axis2-transport/src/org/apache/axis2/transport/http/server because it is not empty. Not deleting. Conflict because clc/modules/axis2-transport/src/org/apache/axis2/transport/http/server is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/axis2-transport/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java Text conflict in clc/modules/cluster-manager/build.xml Conflict: can't delete clc/modules/cluster-manager/conf/rules because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/conf/rules is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/cluster-manager/conf/rules/allocation because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/conf/rules/allocation is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/cluster-manager/conf/rules/allocation/default.groovy Text conflict in clc/modules/cluster-manager/pom.xml Conflict: can't delete clc/modules/cluster-manager/src/edu because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/cluster-manager/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/cluster-manager/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/FailScriptFailException.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/FilenamePrefixFilter.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/SLAs.java Conflict: can't delete clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/Allocator.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/AssignAddressCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/Cluster.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterAllocator.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterEndpoint.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterEnvelope.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterMessageQueue.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterNetworkState.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterNodeState.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterState.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/Clusters.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ConfigureNetworkCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ConsoleOutputCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/EucalyptusWSException.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/NetworkAlreadyExistsException.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/Networks.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/NoSuchTokenException.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/NodeCertCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/NodeLogCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/NotEnoughResourcesAvailable.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/QueuedEvent.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/QueuedEventCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/QueuedLogEvent.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/RebootCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/Reservation.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/Reservations.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ResourceUpdateCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/StartNetworkCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/StopNetworkCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/TerminateCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/UnassignAddressCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmAllocationTransaction.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmInstances.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmRunCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmTypeAvailability.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmTypeVerify.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmTypes.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmUpdateCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VolumeAttachCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VolumeDetachCallback.java Conflict: can't delete clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/net because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/net is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/net/AddressUpdateCallback.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/net/Addresses.java Conflict: can't delete clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/AddressManager.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/CreateVmInstances.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/StateSnapshot.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/SystemState.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmAdmissionControl.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmConsoleOutput.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmControl.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmDescribe.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmMetadata.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmReboot.java Contents conflict in clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmReplyTransform.java Text conflict in clc/modules/core/build.xml Contents conflict in clc/modules/core/conf/eucalyptus-interface.xml Contents conflict in clc/modules/core/conf/eucalyptus-mule.xml Contents conflict in clc/modules/core/conf/eucalyptus-runtime.xml Contents conflict in clc/modules/core/conf/eucalyptus-services.xml Contents conflict in clc/modules/core/conf/eucalyptus-storage.xml Contents conflict in clc/modules/core/conf/eucalyptus-userdata.xml Contents conflict in clc/modules/core/conf/eucalyptus-verification.xml Contents conflict in clc/modules/core/conf/eucalyptus.xml Contents conflict in clc/modules/core/conf/storage-model.xml Contents conflict in clc/modules/core/conf/storage-mule.xml Contents conflict in clc/modules/core/conf/storage-services.xml Contents conflict in clc/modules/core/conf/walrus-model.xml Contents conflict in clc/modules/core/conf/walrus-mule.xml Contents conflict in clc/modules/core/conf/walrus-services.xml Text conflict in clc/modules/core/pom.xml Conflict: can't delete clc/modules/core/resources because it is not empty. Not deleting. Conflict because clc/modules/core/resources is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/core/resources/META-INF because it is not empty. Not deleting. Conflict because clc/modules/core/resources/META-INF is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/resources/META-INF/persistence.xml Contents conflict in clc/modules/core/resources/c3p0-config.xml Contents conflict in clc/modules/core/resources/ehcache.xml Contents conflict in clc/modules/core/resources/eucalyptus.properties Contents conflict in clc/modules/core/resources/log4j.xml Conflict: can't delete clc/modules/core/src/edu because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/core/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/Main.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/StartupChecks.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/AbstractNamedRegistry.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/AccessDeniedException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/BucketAlreadyExistsException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/BucketAlreadyOwnedByYouException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/BucketNotEmptyException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/Configuration.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/DecryptionFailedException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/EntityAlreadyExistsException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/EntityTooLargeException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/EucalyptusCloudException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/EucalyptusInvalidRequestException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/ImageAlreadyExistsException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NoSuchBucketException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NoSuchEntityException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NoSuchSnapshotException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NoSuchVolumeException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NotAuthorizedException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NotImplementedException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/NotModifiedException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/PreconditionFailedException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/SnapshotInUseException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/TooManyBucketsException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/VolumeAlreadyExistsException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/VolumeInUseException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/VolumeNotReadyException.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/Address.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/AttachedVolumeInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/BucketInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/CertificateInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ClusterInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/Counters.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/EntityWrapper.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/GrantInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ImageCacheInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ImageInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ImagePermissionInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/IpRange.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/LVMMetaInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/MetaDataInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/NetworkPeer.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/NetworkRule.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/NetworkRulesGroup.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ObjectInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ProductCode.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/SSHKeyPair.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/SnapshotInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/UserGroupInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/UserInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/VmType.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/VolumeInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/WalrusSnapshotInfo.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/WalrusSnapshotSet.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/cloud/exceptions because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/cloud/exceptions is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/exceptions/ExceptionList.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state/AbstractIsomorph.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state/AlreadyExistsException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state/DoesNotExistException.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state/State.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state/User.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/state/WeakInteraction.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/cloud/ws/AbstractOperation.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/ic because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/ic is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/ic/HttpServer.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/keys because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/keys is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/keys/AbstractKeyStore.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/keys/EucaKeyStore.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/keys/Hashes.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/keys/KeyTool.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/keys/ServiceKeyStore.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/keys/UserKeyStore.java Conflict: can't delete clc/modules/core/src/edu/ucsb/eucalyptus/util because it is not empty. Not deleting. Conflict because clc/modules/core/src/edu/ucsb/eucalyptus/util is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/Admin.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/BaseDirectory.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/CaseInsensitiveMap.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/ErrorFactory.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/EucalyptusProperties.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/Messaging.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/ReplyCoordinator.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/StorageProperties.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/SubDirectory.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/UserManagement.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/WalrusDataMessage.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/WalrusDataMessenger.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/WalrusMonitor.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/WalrusProperties.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/WalrusSemaphore.java Contents conflict in clc/modules/core/src/edu/ucsb/eucalyptus/util/XMLParser.java Conflict: can't delete clc/modules/crypto because it is not empty. Not deleting. Conflict because clc/modules/crypto is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/crypto/build.xml Text conflict in clc/modules/distribution/bin-assembly.xml Text conflict in clc/modules/distribution/lib-assembly.xml Text conflict in clc/modules/distribution/modules-assembly.xml Text conflict in clc/modules/distribution/pom.xml Text conflict in clc/modules/group-manager/build.xml Text conflict in clc/modules/group-manager/pom.xml Conflict: can't delete clc/modules/group-manager/src/edu because it is not empty. Not deleting. Conflict because clc/modules/group-manager/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/group-manager/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/group-manager/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/group-manager/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/group-manager/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/group-manager/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/group-manager/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/group-manager/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/group-manager/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/group-manager/src/edu/ucsb/eucalyptus/cloud/ws/GroupManager.java Text conflict in clc/modules/image-manager/build.xml Text conflict in clc/modules/image-manager/pom.xml Conflict: can't delete clc/modules/image-manager/resources because it is not empty. Not deleting. Conflict because clc/modules/image-manager/resources is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/image-manager/resources/META-INF because it is not empty. Not deleting. Conflict because clc/modules/image-manager/resources/META-INF is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/image-manager/resources/META-INF/persistence.xml Conflict: can't delete clc/modules/image-manager/src/edu because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/image-manager/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/image-manager/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/state because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/state is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/state/Snapshot.java Contents conflict in clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/state/Volume.java Conflict: can't delete clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/ImageManager.java Contents conflict in clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/SnapshotManager.java Contents conflict in clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/VolumeManager.java Conflict: can't delete clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests because it is not empty. Not deleting. Conflict because clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests/XMLParserTest.java Text conflict in clc/modules/interface/build.xml Text conflict in clc/modules/interface/pom.xml Conflict: can't delete clc/modules/interface/src/edu because it is not empty. Not deleting. Conflict because clc/modules/interface/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/interface/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/interface/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/interface/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/interface/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/interface/src/edu/ucsb/eucalyptus/ic because it is not empty. Not deleting. Conflict because clc/modules/interface/src/edu/ucsb/eucalyptus/ic is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/Eucalyptus.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/ReplyQueue.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/RequestQueue.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/StorageRequestQueue.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusMessaging.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java Contents conflict in clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusRequestQueue.java Text conflict in clc/modules/key-manager/build.xml Text conflict in clc/modules/key-manager/pom.xml Conflict: can't delete clc/modules/key-manager/src/edu because it is not empty. Not deleting. Conflict because clc/modules/key-manager/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/key-manager/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/key-manager/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/key-manager/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/key-manager/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/key-manager/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/key-manager/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/key-manager/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/key-manager/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/key-manager/src/edu/ucsb/eucalyptus/cloud/ws/KeyPairBroker.java Text conflict in clc/modules/module-inc.xml Text conflict in clc/modules/msgs/build.xml Text conflict in clc/modules/msgs/pom.xml Conflict: can't delete clc/modules/msgs/resources because it is not empty. Not deleting. Conflict because clc/modules/msgs/resources is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/msgs/resources/2006-06-26-binding.xml Contents conflict in clc/modules/msgs/resources/2006-10-01-binding.xml Contents conflict in clc/modules/msgs/resources/2007-01-03-binding.xml Contents conflict in clc/modules/msgs/resources/2007-01-19-binding.xml Contents conflict in clc/modules/msgs/resources/2007-03-01-binding.xml Contents conflict in clc/modules/msgs/resources/2007-08-29-binding.xml Contents conflict in clc/modules/msgs/resources/2008-02-01-binding.xml Contents conflict in clc/modules/msgs/resources/2008-05-05-binding.xml Contents conflict in clc/modules/msgs/resources/2008-08-08-binding.xml Contents conflict in clc/modules/msgs/resources/2008-12-01-binding.xml Contents conflict in clc/modules/msgs/resources/2009-03-01-binding.xml Contents conflict in clc/modules/msgs/resources/2009-04-04-binding.xml Contents conflict in clc/modules/msgs/resources/CC-binding.xml Contents conflict in clc/modules/msgs/resources/aws-base.xml Contents conflict in clc/modules/msgs/resources/aws-ebs.xml Contents conflict in clc/modules/msgs/resources/aws-image-attr.xml Contents conflict in clc/modules/msgs/resources/aws-images.xml Contents conflict in clc/modules/msgs/resources/aws-instances.xml Contents conflict in clc/modules/msgs/resources/aws-ips.xml Contents conflict in clc/modules/msgs/resources/aws-keypairs.xml Contents conflict in clc/modules/msgs/resources/aws-null-base.xml Contents conflict in clc/modules/msgs/resources/aws-security.xml Contents conflict in clc/modules/msgs/resources/aws-unimplemented.xml Contents conflict in clc/modules/msgs/resources/aws-zones.xml Contents conflict in clc/modules/msgs/resources/cc-getlogs.xml Contents conflict in clc/modules/msgs/resources/cc-network.xml Contents conflict in clc/modules/msgs/resources/cc-resources.xml Contents conflict in clc/modules/msgs/resources/cc-types.xml Contents conflict in clc/modules/msgs/resources/cc-vms.xml Contents conflict in clc/modules/msgs/resources/s3-2006-03-01-binding.xml Contents conflict in clc/modules/msgs/resources/storage-controller-binding.xml Contents conflict in clc/modules/msgs/src/GenerateJibxBinding.groovy Conflict: can't delete clc/modules/msgs/src/edu because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/msgs/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/msgs/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/msgs/src/edu/ucsb/eucalyptus/annotation because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb/eucalyptus/annotation is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/annotation/HttpBinding.java Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/annotation/HttpEmbedded.java Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/annotation/HttpParameterMapping.java Conflict: can't delete clc/modules/msgs/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/cloud/Extra.groovy Conflict: can't delete clc/modules/msgs/src/edu/ucsb/eucalyptus/constants because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb/eucalyptus/constants is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/constants/EventType.java Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/constants/HasName.java Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/constants/VmState.java Conflict: can't delete clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/Messages.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/StorageController.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/Unimplemented.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmAddresses.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmBlockDevice.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmControl.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmImages.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmKeys.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmLocation.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmNetwork.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmSecurity.groovy Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/Walrus.groovy Conflict: can't delete clc/modules/msgs/src/edu/ucsb/eucalyptus/util because it is not empty. Not deleting. Conflict because clc/modules/msgs/src/edu/ucsb/eucalyptus/util is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/util/BindingUtil.java Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/util/InstanceDefaults.java Contents conflict in clc/modules/msgs/src/edu/ucsb/eucalyptus/util/MessageAdapter.java Text conflict in clc/modules/storage-controller/build.xml Text conflict in clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_AOEManager.c Text conflict in clc/modules/storage-controller/native/pom.xml Text conflict in clc/modules/storage-controller/pom.xml Conflict: can't delete clc/modules/storage-controller/src/edu because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/Storage.java Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests/CreateSnapshotTest.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests/CreateVolumeFromSnapshotTest.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests/DeleteSnapshotTest.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests/GetSnapshotTest.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests/StorageTests.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/tests/VolumeTest.java Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb/eucalyptus/ic because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb/eucalyptus/ic is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/ic/StorageController.java Conflict: can't delete clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage because it is not empty. Not deleting. Conflict because clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage/AOEManager.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage/BlockStorageManager.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage/LVM2Manager.java Contents conflict in clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage/StorageExportManager.java Conflict: can't delete clc/modules/storage-manager because it is not empty. Not deleting. Conflict because clc/modules/storage-manager is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/build.xml Conflict: can't delete clc/modules/storage-manager/native because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/native is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/native/edu_ucsb_eucalyptus_storage_fs_FileSystemStorageManager.c Contents conflict in clc/modules/storage-manager/native/pom.xml Contents conflict in clc/modules/storage-manager/pom.xml Conflict: can't delete clc/modules/storage-manager/src because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-manager/src/edu because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children. Versioned directory. Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/Bukkit.java Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests/BukkitImageTest.java Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests/BukkitTest.java Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests/ImageCacheTest.java Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests/ObjectTest.java Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/tests/WalrusBucketTests.java Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus/ic because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus/ic is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/ic/Walrus.java Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage/StorageManager.java Conflict: can't delete clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage/fs because it is not empty. Not deleting. Conflict because clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage/fs is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java Conflict: can't delete clc/modules/workarounds because it is not empty. Not deleting. Conflict because clc/modules/workarounds is not versioned, but has versioned children. Versioned directory. Contents conflict in clc/modules/workarounds/build.xml Text conflict in clc/modules/www/build.xml Text conflict in clc/modules/www/conf/eucalyptus-web-default.properties Text conflict in clc/modules/www/conf/gwt-web.xml Text conflict in clc/modules/www/conf/www/admin.xml Text conflict in clc/modules/www/pom.xml Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ClusterInfoTable.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/DownloadsTable.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackend.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackendAsync.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebInterface.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/GWTUtils.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ImageInfoWeb.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/SystemConfigTable.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/SystemConfigWeb.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/UserInfoWeb.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/VmTypeTable.java Contents conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/index.html Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/BCrypt.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusException.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusManagement.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/Registration.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/RemoteInfoHandler.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/ServletUtils.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/SessionInfo.java Text conflict in clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/X509Download.java Text conflict in clc/modules/www/src/main/resources/eucalyptus-jetty.xml Text conflict in clc/pom.xml Contents conflict in node/handlers-dummy.c Text conflict in node/handlers_kvm.c Conflict: can't delete roll because it is not empty. Not deleting. Conflict because roll is not versioned, but has versioned children. Versioned directory. Contents conflict in roll/Makefile Contents conflict in tools/add_key.sh Text conflict in tools/add_marshalling.pl Text conflict in tools/euca_conf.in Text conflict in tools/euca_ipt Text conflict in tools/euca_sync_key Text conflict in tools/euca_watchdog.pl Text conflict in tools/eucalyptus-cc.in Contents conflict in tools/eucalyptus-cloud.in Text conflict in tools/eucalyptus-nc.in Contents conflict in tools/eucalyptus.conf.debian Text conflict in tools/gen_kvm_libvirt_xml Text conflict in tools/gen_libvirt_xml Contents conflict in tools/rocks-doom-device.sh Text conflict in tools/run_axis.sh Text conflict in tools/set_env.sh Text conflict in util/eucalyptus-config.h.in |
To merge this branch: | bzr merge lp://qastaging/~kirkland/eucalyptus/powernap-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eucalyptus Maintainers | Pending | ||
Review via email: mp+18867@code.qastaging.launchpad.net |
Unmerged revisions
- 1181. By Dustin Kirkland <kirkland@x200>
-
powernap 1.8 uses upstart, and therefore had to deprecate the:
/etc/init.d/powernap now
interface to sending the "powernap now" signal, since upstart does not support
passing of arbitrary commands to init.powernap 1.8 now installs a /usr/sbin/
powernap- now binary which does the same
thing as the previous init based invocation.Update Eucalyptus to use this instead.
Signed-off-by: Dustin Kirkland <email address hidden>
- 1180. By Neil <neil@pall>
-
tweaked default config file.
- 1179. By Neil <neil@pall>
-
tweaked init script so that options disabled by default will be disabled when not specified.
- 1178. By root <root@gibson>
-
Add ability to disable tunneling in eucalyptus.conf (DISABLE_TUNNELING) for debugging purposes, some network features of Eucalyptus will not work properly in MANAGED/
MANAGED- NOVLAN mode(s) when this option is set to "Y". LP: #518601 - 1177. By Neil <neil@pall>
-
fixes LP: #517769
- 1176. By decker <decker@hawaii>
-
fixes for common operations to restore client compatibility for ec2 41510, 41620, 42584, 45772, 46266.
- 1175. By decker <decker@hawaii>
-
handle bad parameters in query requests.
- 1174. By decker <decker@hawaii>
-
make comments in parameter configs possible, start to document configs for channels & vm state, set sane default for cert and client factory.
- 1173. By decker <decker@hawaii>
-
fix detection of orphan address mappings.
- 1172. By decker <decker@hawaii>
-
fix updating of vm state w/ dns info
See commit message. Minor fix for Eucalyptus/Powernap support.