cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [27/27] git commit: updated refs/heads/ui-restyle to 205f22b
Date Mon, 07 Oct 2013 18:30:52 GMT
Merge branch 'master' into ui-restyle


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/205f22b0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/205f22b0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/205f22b0

Branch: refs/heads/ui-restyle
Commit: 205f22b03700310ca61a92aa9db0656f5d7f92f8
Parents: a0fcbbb da814c6
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Oct 7 11:29:59 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Oct 7 11:29:59 2013 -0700

----------------------------------------------------------------------
 agent/src/com/cloud/agent/AgentShell.java       |   6 -
 api/src/com/cloud/agent/api/to/DataStoreTO.java |   2 +-
 api/src/com/cloud/agent/api/to/NfsTO.java       |   9 +-
 api/src/com/cloud/agent/api/to/S3TO.java        |  14 +-
 api/src/com/cloud/agent/api/to/SwiftTO.java     |  11 +-
 api/src/com/cloud/event/EventTypes.java         |   5 +-
 api/src/com/cloud/storage/VolumeApiService.java |   2 +-
 .../storage/snapshot/SnapshotApiService.java    |   2 +
 .../admin/offering/UpdateDiskOfferingCmd.java   |   8 +-
 .../admin/storage/ListStoragePoolsCmd.java      |   3 +-
 .../user/snapshot/RevertSnapshotCmd.java        |  93 +++
 .../command/user/volume/UpdateVolumeCmd.java    |  14 +-
 .../cloudstack/api/response/VolumeResponse.java |  18 +-
 .../cloud/agent/api/AttachVolumeCommand.java    |   8 +-
 .../storage/resource/StorageProcessor.java      |   6 +
 .../StorageSubsystemCommandHandlerBase.java     |  22 +-
 .../storage/template/S3TemplateDownloader.java  |  23 +-
 .../storage/command/ForgetObjectCmd.java        |  37 ++
 .../storage/command/IntroduceObjectAnswer.java  |  33 ++
 .../storage/command/IntroduceObjectCmd.java     |  38 ++
 .../cloudstack/storage/to/ImageStoreTO.java     |  10 +
 .../storage/to/PrimaryDataStoreTO.java          |   1 +
 .../api/agent/test/AttachVolumeAnswerTest.java  |   2 +-
 .../api/agent/test/AttachVolumeCommandTest.java |   2 +-
 debian/changelog                                |   2 +-
 debian/rules                                    |  11 +-
 .../subsystem/api/storage/EndPointSelector.java |   2 +
 .../subsystem/api/storage/SnapshotService.java  |   2 +-
 .../subsystem/api/storage/SnapshotStrategy.java |   4 +-
 .../manager/ClusteredAgentManagerImpl.java      | 103 ++--
 .../entity/api/db/dao/EngineHostDaoImpl.java    |   2 +-
 .../certificate/dao/CertificateDaoImpl.java     |   5 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java     |   2 +-
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java  |   2 +-
 .../dc/dao/DataCenterIpAddressDaoImpl.java      |   2 +-
 .../DataCenterLinkLocalIpAddressDaoImpl.java    |   3 +-
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java |   4 +-
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java  |   7 +-
 .../dc/dao/StorageNetworkIpRangeDaoImpl.java    |   2 +-
 .../src/com/cloud/host/dao/HostDaoImpl.java     |   2 +-
 .../network/dao/AccountGuestVlanMapDaoImpl.java |   2 +-
 .../dao/ExternalFirewallDeviceDaoImpl.java      |   2 +-
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java  |   2 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java |   3 +-
 .../com/cloud/network/dao/NetworkDaoImpl.java   |   4 +-
 .../cloud/network/dao/NetworkDomainDaoImpl.java |   2 +-
 .../dao/NetworkExternalFirewallDaoImpl.java     |   2 +-
 .../dao/NetworkExternalLoadBalancerDaoImpl.java |   2 +-
 .../network/dao/NetworkServiceMapDaoImpl.java   |   2 +-
 .../network/dao/PhysicalNetworkDaoImpl.java     |   2 +-
 .../PhysicalNetworkServiceProviderDaoImpl.java  |   2 +-
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java  |   2 +-
 .../cloud/network/dao/PortProfileDaoImpl.java   |   2 +-
 .../dao/VirtualRouterProviderDaoImpl.java       |   2 +-
 .../network/vpc/dao/NetworkACLDaoImpl.java      |   3 +-
 .../network/vpc/dao/NetworkACLItemDaoImpl.java  |   2 +-
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java |   2 +-
 .../network/vpc/dao/StaticRouteDaoImpl.java     |   2 +-
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |   2 +-
 .../network/vpc/dao/VpcGatewayDaoImpl.java      |   2 +-
 .../network/vpc/dao/VpcOfferingDaoImpl.java     |   2 +-
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java   |   2 +-
 .../network/vpc/dao/VpcServiceMapDaoImpl.java   |   2 +-
 .../offerings/dao/NetworkOfferingDaoImpl.java   |   2 +-
 .../dao/NetworkOfferingServiceMapDaoImpl.java   |   2 +-
 .../service/dao/ServiceOfferingDaoImpl.java     |   2 +-
 .../storage/dao/StoragePoolWorkDaoImpl.java     |   2 +-
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |   4 +-
 .../com/cloud/upgrade/dao/VersionDaoImpl.java   |   2 +-
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java |   2 +-
 .../GlobalLoadBalancerLbRuleMapDaoImpl.java     |   2 +-
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |   2 +-
 .../motion/AncientDataMotionStrategy.java       |  29 +-
 .../storage/image/store/ImageStoreImpl.java     |  14 +-
 .../storage/test/SnapshotTestWithFakeData.java  |  96 ++-
 .../storage/snapshot/SnapshotServiceImpl.java   |  42 +-
 .../storage/snapshot/SnapshotStrategyBase.java  |   7 +-
 .../snapshot/XenserverSnapshotStrategy.java     |  20 +-
 .../endpoint/DefaultEndPointSelector.java       |  10 +-
 .../storage/helper/HypervisorHelper.java        |  31 +
 .../storage/helper/HypervisorHelperImpl.java    |  77 +++
 framework/db/src/com/cloud/utils/db/DB.java     |  16 -
 .../src/com/cloud/utils/db/GenericDaoBase.java  | 122 ++--
 maven-standard/pom.xml                          |   2 +-
 .../database/BaremetalDhcpDaoImpl.java          |   7 +-
 .../baremetal/database/BaremetalPxeDaoImpl.java |   7 +-
 .../kvm/storage/KVMStorageProcessor.java        |  43 +-
 .../resource/SimulatorStorageProcessor.java     |  35 +-
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java |   4 +-
 .../cloud/ucs/database/UcsManagerDaoImpl.java   |   4 +-
 .../vmware/dao/LegacyZoneDaoImpl.java           |   2 +-
 .../vmware/dao/VmwareDatacenterDaoImpl.java     |   2 +-
 .../vmware/manager/VmwareHostService.java       |   6 +-
 .../vmware/resource/VmwareResource.java         | 144 +++--
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java |   2 +-
 .../VmwareSecondaryStorageResourceHandler.java  |   9 +-
 .../resource/VmwareStorageProcessor.java        | 284 ++++-----
 .../xen/resource/CitrixResourceBase.java        |  90 +--
 .../xen/resource/XenServerStorageProcessor.java | 117 ++--
 .../cloud/network/dao/NetScalerPodDaoImpl.java  |   2 +-
 .../driver/S3ImageStoreDriverImpl.java          |   5 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java |   4 +-
 .../storage/datastore/util/SolidFireUtil.java   |  22 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |  21 +
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |   4 +
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |  11 +-
 server/src/com/cloud/configuration/Config.java  |   1 +
 .../configuration/ConfigurationManagerImpl.java |   7 +-
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |   3 +-
 .../hypervisor/HypervisorGuruManagerImpl.java   |   4 +
 .../com/cloud/storage/VolumeApiServiceImpl.java |  19 +-
 .../storage/snapshot/SnapshotManagerImpl.java   | 209 ++++---
 server/test/com/cloud/ha/KVMFencerTest.java     | 193 ++++++
 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java   |   2 +-
 .../vpc/dao/MockNetworkOfferingDaoImpl.java     |   3 +-
 .../MockNetworkOfferingServiceMapDaoImpl.java   |   6 +-
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java   |   2 +-
 .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |   2 +-
 .../cloud/vpc/dao/MockVpcOfferingDaoImpl.java   |   2 +-
 .../dao/MockVpcOfferingServiceMapDaoImpl.java   |   2 +-
 .../resource/NfsSecondaryStorageResource.java   | 119 ++--
 setup/db/db/schema-420to430.sql                 | 113 +++-
 systemvm/pom.xml                                |   2 +-
 test/integration/component/test_vpc_network.py  | 590 ++++++++++---------
 .../component/test_vpc_vm_life_cycle.py         |  53 +-
 tools/build/build_asf.sh                        |   2 +-
 tools/build/setnextversion.sh                   |   2 +-
 tools/marvin/marvin/deployAndRun.py             |  22 +-
 tools/marvin/marvin/deployDataCenter.py         |   4 +-
 ui/scripts/instances.js                         |  81 ++-
 utils/src/com/cloud/utils/S3Utils.java          |  56 ++
 .../utils/backoff/impl/ConstantTimeBackoff.java |  36 +-
 utils/src/com/cloud/utils/script/Script.java    |  28 +-
 .../backoff/impl/ConstantTimeBackoffTest.java   | 110 ++++
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |  28 +-
 135 files changed, 2410 insertions(+), 1176 deletions(-)
----------------------------------------------------------------------



Mime
View raw message