← Back to branch summary

~james-page/ubuntu/maverick/eucalyptus/clock_skew_fix

~james-page/ubuntu/maverick/eucalyptus/clock_skew_fix

« back to all changes in this revision

Viewing changes to clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/Snapshot.java

Committer: Bazaar Package Importer
Author(s): Dave Walker (Daviey)
Date: 2010-08-13 11:25:25 UTC
mfrom: (1.1.42 upstream)
Revision ID: james.westby@ubuntu.com-20100813112525-njue79w1vz7nm9qk

Tags: 2.0~bzr1230-0ubuntu1

https://launchpad.net/bugs/617127

https://launchpad.net/bugs/611769

https://launchpad.net/bugs/617032

https://launchpad.net/bugs/613033

https://launchpad.net/bugs/613033

https://launchpad.net/bugs/584497

https://launchpad.net/bugs/615646

* New upstream merge, r1230 - bug fixes:
- (LP: #617127, #611769, #617032, #613033, #613033, #584497)
* debian/patches/18-priv_security.patch: Added *_iscsitarget.pl scripts to
the wrappers.conf whitelist. (LP: #615646)
* debian/patches/15-fix-default-ramdisk.patch: Dropped, fixed applied upstream.

files added:
clc/modules/msgs/src/main/java/com/eucalyptus/component/Services.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/Expendable.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/HasParent.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/Mappable.java

files removed:
.pc/15-fix-default-ramdisk.patch

.pc/15-fix-default-ramdisk.patch/clc

.pc/15-fix-default-ramdisk.patch/clc/modules

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java/com

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster

.pc/15-fix-default-ramdisk.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb/eucalyptus

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util

.pc/21-eucalyptus-1.7-with-gwt-1.6.4.patch/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util/XHTML.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/Nameable.java

debian/patches/15-fix-default-ramdisk.patch

files modified:
.pc/07-local_support_euca_conf-in.patch/tools/euca_upgrade

.pc/22-uec-multiboot-kvm.patch/util/wrappers.conf

.pc/applied-patches

clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthProvider.java

clc/modules/authentication/src/main/java/com/eucalyptus/auth/GroupEntity.java

clc/modules/bootstrap/eucalyptus-bootstrap.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

clc/modules/component/src/main/resources/component-services.xml

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEMetaInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEVolumeInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ARecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/BucketInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CHAPUserInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CNAMERecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ClusterInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/DirectStorageInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/GrantInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIMetaInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIVolumeInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImageCacheInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/MetaDataInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/NSRecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ObjectInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SOARecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SnapshotInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageStatsInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/TorrentInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/VolumeInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusSnapshotInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusStatsInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ZoneInfo.java

clc/modules/dns/src/main/resources/dns-services.xml

clc/modules/group-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java

clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/Snapshot.java

clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/StorageUtil.java

clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java

clc/modules/msgs/src/main/java/com/eucalyptus/auth/Authentication.java

clc/modules/msgs/src/main/java/com/eucalyptus/auth/UserInfo.java

clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AvailabilityZonePermission.java

clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BaseAuthorization.java

clc/modules/msgs/src/main/java/com/eucalyptus/binding/InternalSoapBindingGenerator.java

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

clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java

clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java

clc/modules/msgs/src/main/java/com/eucalyptus/component/Configuration.java

clc/modules/msgs/src/main/java/com/eucalyptus/component/DispatcherFactoryDiscovery.java

clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java

clc/modules/msgs/src/main/java/com/eucalyptus/config/ConfigurationEntities.groovy

clc/modules/msgs/src/main/java/com/eucalyptus/configurable/MultiDatabasePropertyEntry.java

clc/modules/msgs/src/main/java/com/eucalyptus/configurable/SingletonDatabasePropertyEntry.java

clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java

clc/modules/msgs/src/main/java/com/eucalyptus/entities/BaseEntities.groovy

clc/modules/msgs/src/main/java/com/eucalyptus/entities/Counters.java

clc/modules/msgs/src/main/java/com/eucalyptus/entities/VmType.java

clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java

clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java

clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java

clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java

clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageAuthorization.java

clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageInfo.java

clc/modules/msgs/src/main/java/com/eucalyptus/images/ProductCode.java

clc/modules/msgs/src/main/java/com/eucalyptus/records/BaseRecord.java

clc/modules/msgs/src/main/java/com/eucalyptus/records/EventClass.java

clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java

clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/Transition.java

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Configuration.groovy

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmBlockDevice.groovy

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmNetwork.groovy

clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/LogicalStorageManager.java

clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorage.java

clc/modules/walrus/src/main/resources/walrus-services.xml

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/MetadataPipeline.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java

clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml

debian/changelog

debian/patches/18-priv_security.patch

debian/patches/21-eucalyptus-1.7-with-gwt-1.6.4.patch

debian/patches/series

eucalyptus.spec

tools/euca_upgrade

util/wrappers.conf

Show diffs side-by-side

added added

removed removed

clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/Snapshot.java

77

77

78

78

@Entity

79

79

@PersistenceContext(name="eucalyptus_images")

80

@Cache( usage = CacheConcurrencyStrategy.TRANSACTIONAL )

80

@Cache( usage = CacheConcurrencyStrategy.READ_WRITE )

81

81

public class Snapshot extends AbstractIsomorph {

82

82

@Column(name="parentvolume")

83

83

private String parentVolume;

Older »