You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/01/14 10:22:06 UTC
[4/5] git commit: updated refs/heads/marvin to 1577c0a
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3be221c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3be221c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3be221c4
Branch: refs/heads/marvin
Commit: 3be221c452472e39e7ba252a3f48451c2150c913
Parents: 09a45d4 470f251
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Jan 13 13:53:32 2014 +0100
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jan 13 13:53:32 2014 +0100
----------------------------------------------------------------------
LICENSE.header | 16 +
agent/pom.xml | 33 -
api/src/com/cloud/deploy/DeployDestination.java | 21 +-
api/src/com/cloud/deploy/DeploymentPlanner.java | 11 +-
api/src/com/cloud/deploy/HAPlanner.java | 21 +
api/src/com/cloud/event/EventTypes.java | 10 +
api/src/com/cloud/exception/CloudException.java | 5 +-
.../exception/OperationTimedoutException.java | 10 +-
api/src/com/cloud/host/Host.java | 5 +
.../com/cloud/hypervisor/HypervisorGuru.java | 2 +
api/src/com/cloud/network/Network.java | 12 +-
api/src/com/cloud/network/NetworkModel.java | 2 +
api/src/com/cloud/network/NetworkService.java | 4 +-
api/src/com/cloud/network/Networks.java | 2 +-
api/src/com/cloud/network/PhysicalNetwork.java | 2 +-
.../network/security/SecurityGroupService.java | 2 +-
api/src/com/cloud/server/ResourceTag.java | 8 +-
api/src/com/cloud/storage/DataStoreRole.java | 4 +-
api/src/com/cloud/storage/Storage.java | 2 +
api/src/com/cloud/storage/StorageService.java | 30 +-
api/src/com/cloud/storage/Volume.java | 2 -
.../com/cloud/user/ResourceLimitService.java | 14 +-
api/src/com/cloud/vm/NicProfile.java | 107 +-
api/src/com/cloud/vm/VirtualMachineName.java | 13 +
.../org/apache/cloudstack/api/ApiConstants.java | 4 +-
.../cloudstack/api/ServerApiException.java | 4 +
.../admin/host/AddSecondaryStorageCmd.java | 22 +-
.../command/admin/storage/AddImageStoreCmd.java | 10 +-
.../api/command/admin/storage/AddS3Cmd.java | 46 +-
.../PrepareSecondaryStorageForMigrationCmd.java | 110 -
.../storage/UpdateCloudToUseObjectStoreCmd.java | 142 +
.../api/command/admin/swift/AddSwiftCmd.java | 23 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 35 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 35 +-
.../admin/vlan/CreateVlanIpRangeCmd.java | 3 +
.../affinitygroup/ListAffinityGroupsCmd.java | 7 +-
.../api/command/user/iso/ListIsosCmd.java | 7 +
.../command/user/network/ListNetworksCmd.java | 25 +-
.../command/user/template/CopyTemplateCmd.java | 5 +-
.../command/user/template/ListTemplatesCmd.java | 7 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 62 +-
.../api/command/user/vm/DeployVMCmd.java | 146 +-
.../api/command/user/vm/ListNicsCmd.java | 11 +-
.../api/command/user/vm/ListVMsCmd.java | 2 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 2 +-
.../api/command/user/vm/ScaleVMCmd.java | 33 +-
.../api/command/user/vm/UpgradeVMCmd.java | 31 +-
.../user/volume/AddResourceDetailCmd.java | 11 +-
.../cloudstack/api/response/NicResponse.java | 11 +-
.../api/response/ProviderResponse.java | 3 +-
.../cloudstack/api/response/UserVmResponse.java | 38 +-
.../network/ExternalNetworkDeviceManager.java | 1 +
.../apache/cloudstack/query/QueryService.java | 13 +-
api/test/com/cloud/network/NetworksTest.java | 15 +
.../api/command/test/AddIpToVmNicTest.java | 6 +-
.../test/AddSecondaryStorageCmdTest.java | 12 +-
awsapi/pom.xml | 12 +
build/checkstyle/pom.xml | 21 -
.../src/main/resources/tooling/checkstyle.xml | 55 -
.../classes/resources/messages.properties | 20 +
client/pom.xml | 15 +
client/tomcatconf/commands.properties.in | 7 +-
core/pom.xml | 5 +
.../core/spring-core-registry-core-context.xml | 5 +
...re-lifecycle-planner-context-inheritable.xml | 5 +
.../cloud/agent/api/SecStorageSetupCommand.java | 41 +-
.../agent/api/storage/MigrateVolumeCommand.java | 12 +
core/src/com/cloud/host/HostInfo.java | 3 +-
.../cloud/storage/template/OVAProcessor.java | 158 +
.../cloud/storage/template/VmdkProcessor.java | 95 +-
.../cloudstack/storage/command/CopyCommand.java | 12 +
.../cloudstack/storage/to/SnapshotObjectTO.java | 26 +
.../api/agent/test/CheckOnHostCommandTest.java | 5 +-
deps/XenServerJava/pom.xml | 27 +-
.../src/com/xensource/xenapi/Event.java | 15 +
.../src/com/xensource/xenapi/Types.java | 50 +
.../src/com/xensource/xenapi/VDI.java | 23 +
.../src/com/cloud/vm/VirtualMachineManager.java | 51 +-
.../service/NetworkOrchestrationService.java | 4 +-
.../service/VolumeOrchestrationService.java | 18 +
.../subsystem/api/storage/DataStoreManager.java | 2 +
.../subsystem/api/storage/EndPointSelector.java | 6 +
.../api/storage/PrimaryDataStoreDriver.java | 10 +
.../api/storage/SnapshotDataFactory.java | 2 +
.../subsystem/api/storage/SnapshotService.java | 2 +
.../subsystem/api/storage/StorageAction.java | 25 +
.../subsystem/api/storage/VolumeInfo.java | 2 +
.../subsystem/api/storage/VolumeService.java | 4 +
.../cloud/deploy/DeploymentPlanningManager.java | 9 +-
.../src/com/cloud/network/IpAddressManager.java | 5 +-
.../src/com/cloud/resource/ResourceManager.java | 3 +
.../src/com/cloud/template/TemplateManager.java | 2 +
.../components-api/src/com/cloud/vm/VmWork.java | 9 +-
.../src/com/cloud/vm/VmWorkConstants.java | 23 +
.../src/com/cloud/vm/VmWorkJobHandler.java | 25 +
.../src/com/cloud/vm/VmWorkJobHandlerProxy.java | 133 +
.../src/com/cloud/vm/VmWorkSerializer.java | 74 +
.../cloud/vm/snapshot/VMSnapshotManager.java | 1 -
...spring-engine-orchestration-core-context.xml | 13 +-
.../cloud/agent/manager/AgentManagerImpl.java | 20 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 983 +-
.../src/com/cloud/vm/VmWorkAddVmToNetwork.java | 20 +-
.../src/com/cloud/vm/VmWorkJobDispatcher.java | 136 +-
.../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 6 +
.../src/com/cloud/vm/VmWorkMigrate.java | 5 +-
.../src/com/cloud/vm/VmWorkMigrateForScale.java | 10 +-
.../com/cloud/vm/VmWorkMigrateWithStorage.java | 10 +-
.../src/com/cloud/vm/VmWorkReboot.java | 12 +-
.../src/com/cloud/vm/VmWorkReconfigure.java | 17 +-
.../src/com/cloud/vm/VmWorkRemoveNicFromVm.java | 12 +-
.../com/cloud/vm/VmWorkRemoveVmFromNetwork.java | 8 +-
.../src/com/cloud/vm/VmWorkSerializer.java | 74 -
.../src/com/cloud/vm/VmWorkStart.java | 14 +-
.../src/com/cloud/vm/VmWorkStop.java | 4 +-
.../com/cloud/vm/VmWorkStorageMigration.java | 6 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 2 +-
.../entity/api/VirtualMachineEntityImpl.java | 2 -
.../orchestration/NetworkOrchestrator.java | 319 +-
.../orchestration/VolumeOrchestrator.java | 150 +-
.../spring-engine-schema-core-daos-context.xml | 4 +-
.../com/cloud/event/dao/UsageEventDaoImpl.java | 34 +-
.../cloud/event/dao/UsageEventDetailsDao.java | 1 -
.../event/dao/UsageEventDetailsDaoImpl.java | 47 -
.../src/com/cloud/keystore/KeystoreDao.java | 31 -
.../src/com/cloud/keystore/KeystoreDaoImpl.java | 121 -
.../src/com/cloud/keystore/KeystoreVO.java | 102 -
.../com/cloud/network/dao/NetworkDaoImpl.java | 2 +
.../com/cloud/service/ServiceOfferingVO.java | 26 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 1 -
.../src/com/cloud/storage/dao/SnapshotDao.java | 9 -
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 22 +-
.../cloud/storage/dao/SnapshotDetailsVO.java | 4 +
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 40 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade421to430.java | 36 +
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 5 +-
.../src/com/cloud/vm/dao/DomainRouterDao.java | 10 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 38 +-
engine/schema/src/com/cloud/vm/dao/NicDao.java | 2 +-
.../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 11 +-
.../src/com/cloud/vm/dao/NicSecondaryIpVO.java | 46 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +
.../engine/cloud/entity/api/db/VMEntityVO.java | 17 -
.../resourcedetail/DiskOfferingDetailVO.java | 81 +
.../cloudstack/resourcedetail/UserDetailVO.java | 81 +
.../dao/DiskOfferingDetailsDao.java | 26 +
.../dao/DiskOfferingDetailsDaoImpl.java | 33 +
.../resourcedetail/dao/UserDetailsDao.java | 26 +
.../resourcedetail/dao/UserDetailsDaoImpl.java | 33 +
.../datastore/db/SnapshotDataStoreDao.java | 4 +
.../datastore/db/TemplateDataStoreDao.java | 2 +
.../service/src/main/webapp/WEB-INF/beans.xml | 6 +-
.../motion/AncientDataMotionStrategy.java | 37 +-
.../storage/image/TemplateServiceImpl.java | 17 +-
engine/storage/integration-test/pom.xml | 33 -
.../test/FakePrimaryDataStoreDriver.java | 23 +-
.../cloudstack/storage/test/SnapshotTest.java | 3 +-
.../storage/test/VolumeServiceTest.java | 2 +-
.../cloudstack/storage/test/VolumeTest.java | 2 +-
.../storage/test/VolumeTestVmware.java | 2 +-
.../resources/StorageAllocatorTestContext.xml | 18 +-
.../snapshot/SnapshotDataFactoryImpl.java | 12 +
.../storage/snapshot/SnapshotObject.java | 13 +-
.../storage/snapshot/SnapshotServiceImpl.java | 114 +-
.../snapshot/XenserverSnapshotStrategy.java | 27 +-
.../cloudstack/storage/RemoteHostEndPoint.java | 24 +-
.../ClusterScopeStoragePoolAllocator.java | 8 +
.../allocator/ZoneWideStoragePoolAllocator.java | 6 +
.../storage/datastore/DataStoreManagerImpl.java | 9 +
.../datastore/ObjectInDataStoreManagerImpl.java | 1 +
.../endpoint/DefaultEndPointSelector.java | 98 +-
.../storage/helper/HypervisorHelperImpl.java | 3 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 42 +
.../image/db/TemplateDataStoreDaoImpl.java | 9 +-
.../cloudstack/storage/volume/VolumeObject.java | 15 +-
.../storage/volume/VolumeServiceImpl.java | 18 +
.../com/cloud/cluster/ClusterManagerImpl.java | 18 +-
.../framework/config/ConfigDepot.java | 4 +-
.../framework/config/impl/ConfigDepotImpl.java | 20 +-
.../com/cloud/utils/db/TransactionLegacy.java | 24 +-
.../jobs/AsyncJobExecutionContext.java | 19 +-
.../framework/jobs/AsyncJobManager.java | 12 +-
.../jobs/impl/AsyncJobManagerImpl.java | 18 +
.../framework/jobs/impl/OutcomeImpl.java | 6 +-
framework/pom.xml | 1 +
framework/security/pom.xml | 56 +
.../spring-framework-security-core-context.xml | 31 +
.../security/keystore/KeystoreDao.java | 31 +
.../security/keystore/KeystoreDaoImpl.java | 121 +
.../security/keystore/KeystoreManager.java | 64 +
.../security/keystore/KeystoreManagerImpl.java | 154 +
.../framework/security/keystore/KeystoreVO.java | 102 +
.../lifecycle/registry/ExtensionRegistry.java | 3 +-
packaging/centos63/cloud.spec | 2 +
plugins/event-bus/inmemory/pom.xml | 40 +
.../mom/inmemory/InMemoryEventBus.java | 163 +
plugins/ha-planners/skip-heurestics/pom.xml | 29 +
.../skip-heurestics/module.properties | 18 +
.../spring-skip-heurestics-context.xml | 26 +
.../com/cloud/deploy/SkipHeuresticsPlanner.java | 61 +
.../DotNet/ServerResource/AgentShell/Program.cs | 87 +-
.../AgentShell/ProjectInstaller.Designer.cs | 31 +-
.../ServerResource/HypervResource/App.config | 6 +-
.../HypervResource/CloudStackTypes.cs | 133 +-
.../HypervResource/HypervResourceController.cs | 366 +-
.../HypervResource/IWmiCallsV2.cs | 5 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 203 +-
.../spring-hyperv-compute-context.xml | 4 +-
.../src/com/cloud/ha/HypervInvestigator.java | 77 +
.../hyperv/manager/HypervManagerImpl.java | 6 +-
.../resource/HypervDirectConnectResource.java | 132 +-
.../kvm/resource/BridgeVifDriver.java | 3 +-
.../kvm/resource/LibvirtComputingResource.java | 204 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 31 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 8 +-
.../kvm/storage/KVMStoragePoolManager.java | 5 +
.../kvm/storage/KVMStorageProcessor.java | 1 +
.../kvm/storage/LibvirtStorageAdaptor.java | 8 +-
.../apache/cloudstack/utils/qemu/QemuImg.java | 7 +-
.../resource/LibvirtComputingResourceTest.java | 146 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 17 +-
.../vmware/manager/VmwareStorageManager.java | 4 +
.../manager/VmwareStorageManagerImpl.java | 231 +-
.../vmware/resource/VmwareResource.java | 71 +-
.../resource/VmwareStorageProcessor.java | 114 +-
.../VmwareStorageSubsystemCommandHandler.java | 3 +
.../src/com/cloud/hypervisor/XenServerGuru.java | 94 +
.../xen/discoverer/XcpServerDiscoverer.java | 48 +-
.../xen/resource/CitrixResourceBase.java | 795 +-
.../xen/resource/XenServerPoolVms.java | 5 +
.../xen/resource/XenServerStorageProcessor.java | 184 +-
.../xen/resource/Xenserver625Resource.java | 112 +
.../resource/Xenserver625StorageProcessor.java | 822 ++
.../xenserver/XenServerResourceNewBase.java | 320 +
.../cloud/network/element/CiscoVnmcElement.java | 9 +-
plugins/network-elements/f5/pom.xml | 5 +
.../contrail/management/ModelDatabase.java | 2 +-
.../contrail/model/VirtualMachineModel.java | 23 +-
.../management/VirtualNetworkModelTest.java | 56 -
.../contrail/model/VirtualMachineModelTest.java | 124 +
.../contrail/model/VirtualNetworkModelTest.java | 102 +
plugins/network-elements/nicira-nvp/pom.xml | 63 +-
.../cloud/network/element/NiciraNvpElement.java | 75 +-
.../network/nicira/AccessConfiguration.java | 129 +
.../com/cloud/network/nicira/AccessRule.java | 55 +
.../src/com/cloud/network/nicira/Acl.java | 21 +
.../src/com/cloud/network/nicira/AclRule.java | 206 +
.../com/cloud/network/nicira/NiciraNvpApi.java | 377 +-
.../cloud/network/nicira/SecurityProfile.java | 21 +
.../com/cloud/network/nicira/SecurityRule.java | 135 +
.../SingleDefaultRouteImplictRoutingConfig.java | 2 +-
.../cloud/network/nicira/NiciraNvpApiIT.java | 163 +
.../cloud/network/nicira/NiciraNvpApiTest.java | 196 +-
.../nicira-nvp/test/resources/config.properties | 21 +
plugins/network-elements/opendaylight/pom.xml | 104 +
.../opendaylight/OpendaylightElement.java | 174 +
.../OpendaylightGuestNetworkGuru.java | 276 +
.../agent/OpenDaylightControllerResource.java | 344 +
.../OpenDaylightControllerResourceManager.java | 42 +
...enDaylightControllerResourceManagerImpl.java | 219 +
.../agent/commands/AddHypervisorCommand.java | 58 +
.../agent/commands/ConfigureNetworkCommand.java | 54 +
.../agent/commands/ConfigurePortCommand.java | 80 +
.../agent/commands/DestroyNetworkCommand.java | 45 +
.../agent/commands/DestroyPortCommand.java | 50 +
.../StartupOpenDaylightControllerCommand.java | 29 +
.../agent/responses/AddHypervisorAnswer.java | 35 +
.../agent/responses/ConfigureNetworkAnswer.java | 43 +
.../agent/responses/ConfigurePortAnswer.java | 35 +
.../agent/responses/DestroyNetworkAnswer.java | 35 +
.../agent/responses/DestroyPortAnswer.java | 35 +
.../api/NeutronInvalidCredentialsException.java | 38 +
.../opendaylight/api/NeutronRestApi.java | 217 +
.../api/NeutronRestApiException.java | 38 +
.../opendaylight/api/NeutronRestFactory.java | 55 +
.../commands/AddOpenDaylightControllerCmd.java | 114 +
.../DeleteOpenDaylightControllerCmd.java | 99 +
.../ListOpenDaylightControllersCmd.java | 104 +
.../api/enums/NeutronNorthboundEnum.java | 44 +
.../opendaylight/api/model/NeutronNetwork.java | 213 +
.../api/model/NeutronNetworkWrapper.java | 70 +
.../api/model/NeutronNetworksList.java | 42 +
.../opendaylight/api/model/NeutronNode.java | 98 +
.../api/model/NeutronNodeWrapper.java | 65 +
.../api/model/NeutronNodesList.java | 42 +
.../opendaylight/api/model/NeutronPort.java | 265 +
.../api/model/NeutronPortWrapper.java | 70 +
.../api/model/NeutronPortsList.java | 42 +
.../opendaylight/api/resources/Action.java | 287 +
.../NeutronNetworksNorthboundAction.java | 113 +
.../resources/NeutronNodesNorthboundAction.java | 89 +
.../resources/NeutronPortsNorthboundAction.java | 111 +
.../OpenDaylightControllerResponse.java | 73 +
.../dao/OpenDaylightControllerMappingDao.java | 28 +
.../OpenDaylightControllerMappingDaoImpl.java | 45 +
.../dao/OpenDaylightControllerVO.java | 100 +
.../cloudstack/opendaylight/module.properties | 21 +
.../spring-opendaylight-context.xml | 42 +
.../opendaylight/api/test/NeutronEnumsTest.java | 85 +
.../api/test/NeutronNetworkAdapterTest.java | 88 +
.../api/test/NeutronNodeAdapterTest.java | 74 +
.../api/test/NeutronPortAdapterTest.java | 95 +
.../opendaylight/api/test/NeutronRestApiIT.java | 95 +
.../api/test/NeutronRestApiTest.java | 254 +
.../cloudstack/ssp/spring-ssp-context.xml | 1 -
plugins/pom.xml | 3 +
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 4 +-
.../SamplePrimaryDataStoreDriverImpl.java | 14 +
.../driver/SolidfirePrimaryDataStoreDriver.java | 390 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 10 -
.../storage/datastore/util/SolidFireUtil.java | 559 +-
plugins/user-authenticators/ldap/pom.xml | 2 -
.../cloudstack/api/command/LDAPConfigCmd.java | 41 +-
.../api/response/LdapConfigurationResponse.java | 13 +-
.../cloudstack/ldap/LdapConfigurationVO.java | 21 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 9 +-
pom.xml | 62 +-
scripts/storage/secondary/createtmplt.sh | 4 +-
scripts/storage/secondary/createvolume.sh | 23 +-
scripts/vm/hypervisor/xenserver/hostvmstats.py | 19 +-
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 17 +-
.../vm/hypervisor/xenserver/xenserver56/patch | 1 +
.../hypervisor/xenserver/xenserver56fp1/patch | 1 +
.../xenserver/xenserver62/cloud-plugin-storage | 301 +
.../vm/hypervisor/xenserver/xenserver62/patch | 74 +
server/pom.xml | 50 +-
.../spring-server-core-managers-context.xml | 11 +-
server/src/com/cloud/api/ApiDBUtils.java | 19 +-
server/src/com/cloud/api/ApiResponseHelper.java | 159 +-
.../com/cloud/api/query/QueryManagerImpl.java | 76 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 3 +
.../cloud/api/query/dao/TemplateJoinDao.java | 7 +-
.../api/query/dao/TemplateJoinDaoImpl.java | 20 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 24 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 4 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 7 +
.../com/cloud/api/query/vo/UserVmJoinVO.java | 21 +
.../api/response/ApiResponseSerializer.java | 10 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 49 +-
server/src/com/cloud/configuration/Config.java | 9 +-
.../configuration/ConfigurationManagerImpl.java | 458 +-
.../AgentBasedConsoleProxyManager.java | 2 +-
.../com/cloud/consoleproxy/AgentHookBase.java | 2 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 13 +-
.../consoleproxy/StaticConsoleProxyManager.java | 4 +-
.../deploy/DeploymentPlanningManagerImpl.java | 31 +-
.../src/com/cloud/deploy/FirstFitPlanner.java | 10 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 31 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 5 +
.../src/com/cloud/keystore/KeystoreManager.java | 32 -
.../com/cloud/keystore/KeystoreManagerImpl.java | 155 -
.../metadata/ResourceMetaDataManagerImpl.java | 8 +
.../com/cloud/network/IpAddressManagerImpl.java | 168 +-
.../src/com/cloud/network/NetworkModelImpl.java | 13 +
.../com/cloud/network/NetworkServiceImpl.java | 504 +-
.../element/VpcVirtualRouterElement.java | 16 +-
.../cloud/network/guru/ControlNetworkGuru.java | 4 +-
.../VirtualNetworkApplianceManagerImpl.java | 52 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 23 +-
.../security/SecurityGroupManagerImpl.java | 103 +-
.../network/vpc/NetworkACLManagerImpl.java | 8 +-
.../network/vpc/NetworkACLServiceImpl.java | 23 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 7 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 46 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 53 +-
.../cloud/server/ConfigurationServerImpl.java | 3 +-
.../src/com/cloud/server/ManagementServer.java | 6 -
.../com/cloud/server/ManagementServerImpl.java | 210 +-
.../cloud/servlet/ConsoleProxyClientParam.java | 10 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 10 +-
.../com/cloud/storage/StorageManagerImpl.java | 115 +-
.../storage/StoragePoolAutomationImpl.java | 24 +-
.../com/cloud/storage/VmWorkAttachVolume.java | 40 +
.../com/cloud/storage/VmWorkDetachVolume.java | 34 +
.../com/cloud/storage/VmWorkMigrateVolume.java | 46 +
.../com/cloud/storage/VmWorkResizeVolume.java | 61 +
.../cloud/storage/VmWorkTakeVolumeSnapshot.java | 54 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 761 +-
.../storage/listener/StoragePoolMonitor.java | 6 +-
.../secondary/SecondaryStorageManagerImpl.java | 12 +-
.../storage/snapshot/SnapshotManagerImpl.java | 40 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 8 +
.../template/HypervisorTemplateAdapter.java | 57 +-
.../com/cloud/template/TemplateManagerImpl.java | 65 +-
.../src/com/cloud/user/AccountManagerImpl.java | 11 +-
server/src/com/cloud/vm/UserVmManager.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 538 +-
.../src/com/cloud/vm/UserVmStateListener.java | 54 +-
.../vm/snapshot/VMSnapshotManagerImpl.java | 530 +-
.../vm/snapshot/VmWorkCreateVMSnapshot.java | 41 +
.../vm/snapshot/VmWorkDeleteAllVMSnapshots.java | 35 +
.../vm/snapshot/VmWorkDeleteVMSnapshot.java | 35 +
.../vm/snapshot/VmWorkRevertToVMSnapshot.java | 35 +
.../com/cloud/network/MockNetworkModelImpl.java | 9 +
.../cloud/resource/MockResourceManagerImpl.java | 9 +
.../vm/DeploymentPlanningManagerImplTest.java | 6 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 11 +-
.../com/cloud/vpc/MockNetworkModelImpl.java | 10 +
.../com/cloud/vpc/NetworkACLServiceTest.java | 2 +
.../SecurityGroupManagerTestContext.xml | 20 +-
.../test/resources/SnapshotDaoTestContext.xml | 20 +-
.../resources/StoragePoolDaoTestContext.xml | 20 +-
.../console-proxy-rdp/rdpconsole/README.txt | 54 +-
services/console-proxy-rdp/rdpconsole/pom.xml | 9 +-
.../console-proxy-rdp/rdpconsole/rdp-config.bat | 2 +-
.../src/main/java/common/AwtBellAdapter.java | 77 -
.../src/main/java/common/AwtCanvasAdapter.java | 166 -
.../main/java/common/AwtClipboardAdapter.java | 56 -
.../src/main/java/common/AwtKeyEventSource.java | 0
.../main/java/common/AwtMouseEventSource.java | 0
.../src/main/java/common/BitmapOrder.java | 3 +-
.../src/main/java/common/BitmapRectangle.java | 6 +-
.../main/java/common/BufferedImageCanvas.java | 2 +-
.../common/BufferedImageCopyRectAdapter.java | 32 +-
.../java/common/BufferedImagePixelsAdapter.java | 46 +-
.../rdpconsole/src/main/java/common/Client.java | 283 +-
.../src/main/java/common/CopyRectOrder.java | 0
.../src/main/java/common/KeyOrder.java | 0
.../src/main/java/common/MouseOrder.java | 0
.../src/main/java/common/OrderType.java | 0
.../src/main/java/common/ScreenDescription.java | 56 +-
.../main/java/common/SizeChangeListener.java | 0
.../java/common/adapter/AwtBellAdapter.java | 77 +
.../java/common/adapter/AwtCanvasAdapter.java | 171 +
.../common/adapter/AwtClipboardAdapter.java | 57 +
.../src/main/java/common/asn1/Any.java | 78 +
.../main/java/common/asn1/Asn1Constants.java | 83 +
.../src/main/java/common/asn1/Asn1Integer.java | 116 +
.../src/main/java/common/asn1/BerType.java | 40 +
.../src/main/java/common/asn1/BitString.java | 67 +
.../src/main/java/common/asn1/ObjectID.java | 67 +
.../src/main/java/common/asn1/OctetString.java | 80 +
.../src/main/java/common/asn1/Sequence.java | 143 +
.../src/main/java/common/asn1/SequenceOf.java | 82 +
.../src/main/java/common/asn1/Tag.java | 462 +
.../main/java/common/opt/IncrementalOption.java | 28 +
.../src/main/java/common/opt/IntOption.java | 41 +
.../opt/NoArgumentForOptionException.java | 26 +
.../src/main/java/common/opt/Option.java | 102 +
.../src/main/java/common/opt/OptionParser.java | 147 +
.../common/opt/OptionRequiredException.java | 26 +
.../main/java/common/opt/StringArrayOption.java | 38 +
.../common/opt/StringEnumerationOption.java | 72 +
.../src/main/java/common/opt/StringOption.java | 41 +
.../java/common/opt/UnknownOptionException.java | 27 +
.../java/rdpclient/AwtRdpKeyboardAdapter.java | 350 -
.../main/java/rdpclient/AwtRdpMouseAdapter.java | 179 -
.../java/rdpclient/ClientConfirmActivePDU.java | 1129 ---
.../main/java/rdpclient/ClientFastPathPDU.java | 55 -
.../src/main/java/rdpclient/ClientInfoPDU.java | 455 -
.../rdpclient/ClientMCSAttachUserRequest.java | 103 -
...lJoinRequestServerMCSChannelConfirmPDUs.java | 222 -
.../java/rdpclient/ClientMCSConnectInitial.java | 669 --
.../rdpclient/ClientMCSErectDomainRequest.java | 189 -
.../java/rdpclient/ClientPacketSniffer.java | 49 -
.../java/rdpclient/ClientSynchronizePDU.java | 248 -
.../src/main/java/rdpclient/ClientTpkt.java | 54 -
.../ClientX224ConnectionRequestPDU.java | 156 -
.../main/java/rdpclient/ClientX224DataPdu.java | 52 -
.../src/main/java/rdpclient/HandshakeEnd.java | 27 -
.../src/main/java/rdpclient/MockServer.java | 198 -
.../src/main/java/rdpclient/PacketSniffer.java | 75 -
.../java/rdpclient/RLEBitmapDecompression.java | 985 --
.../src/main/java/rdpclient/RdpClient.java | 297 +-
.../src/main/java/rdpclient/RdpConstants.java | 70 -
.../src/main/java/rdpclient/RdpState.java | 33 -
.../main/java/rdpclient/ServerBitmapUpdate.java | 200 -
.../java/rdpclient/ServerChannel1003Router.java | 533 -
.../rdpclient/ServerControlPDUCooperate.java | 117 -
.../ServerControlPDUGrantedControl.java | 114 -
.../java/rdpclient/ServerDemandActivePDU.java | 660 --
.../src/main/java/rdpclient/ServerFastPath.java | 258 -
.../ServerLicenseErrorPDUValidClient.java | 121 -
.../ServerMCSAttachUserConfirmPDU.java | 134 -
.../ServerMCSChannelJoinConfirmPDU.java | 89 -
.../rdpclient/ServerMCSConnectResponse.java | 283 -
.../src/main/java/rdpclient/ServerMCSPDU.java | 149 -
.../java/rdpclient/ServerPacketSniffer.java | 50 -
.../java/rdpclient/ServerPaletteUpdate.java | 77 -
.../java/rdpclient/ServerSynchronizePDU.java | 115 -
.../src/main/java/rdpclient/ServerTpkt.java | 70 -
.../ServerX224ConnectionConfirmPDU.java | 237 -
.../main/java/rdpclient/ServerX224DataPdu.java | 64 -
.../rdpclient/TrustAllX509TrustManager.java | 40 -
.../main/java/rdpclient/UpgradeSocketToSSL.java | 44 -
.../adapter/AwtRdpKeyboardAdapter.java | 350 +
.../rdpclient/adapter/AwtRdpMouseAdapter.java | 179 +
.../rdpclient/clip/ClipboardDataFormat.java | 143 +
.../java/rdpclient/clip/ClipboardState.java | 70 +
.../clip/ServerClipRdrChannelRouter.java | 193 +
.../clip/ServerClipboardCapabilitiesPDU.java | 180 +
.../clip/ServerFormatDataResponsePDU.java | 97 +
.../rdpclient/clip/ServerFormatListPDU.java | 237 +
.../rdpclient/clip/ServerMonitorReadyPDU.java | 85 +
.../rdpclient/debug/ClientPacketSniffer.java | 51 +
.../java/rdpclient/debug/PacketSniffer.java | 75 +
.../rdpclient/debug/ServerPacketSniffer.java | 49 +
.../hyperv/ClientPreConnectionBlob.java | 121 +
.../ntlmssp/ClientNtlmsspNegotiate.java | 177 +
.../ntlmssp/ClientNtlmsspPubKeyAuth.java | 680 ++
.../ntlmssp/ClientNtlmsspUserCredentials.java | 128 +
.../java/rdpclient/ntlmssp/CryptoAlgos.java | 361 +
.../main/java/rdpclient/ntlmssp/NegoFlags.java | 492 +
.../java/rdpclient/ntlmssp/NtlmCompute.java | 24 +
.../java/rdpclient/ntlmssp/NtlmConstants.java | 157 +
.../main/java/rdpclient/ntlmssp/NtlmState.java | 887 ++
.../main/java/rdpclient/ntlmssp/SecBuffer.java | 21 +
.../ntlmssp/ServerNtlmsspChallenge.java | 293 +
.../ntlmssp/ServerNtlmsspPubKeyPlus1.java | 125 +
.../ntlmssp/asn1/AlgorithmIdentifier.java | 40 +
.../java/rdpclient/ntlmssp/asn1/NegoData.java | 64 +
.../java/rdpclient/ntlmssp/asn1/NegoItem.java | 73 +
.../ntlmssp/asn1/SubjectPublicKeyInfo.java | 35 +
.../rdpclient/ntlmssp/asn1/TSCredentials.java | 62 +
.../rdpclient/ntlmssp/asn1/TSCspDataDetail.java | 98 +
.../rdpclient/ntlmssp/asn1/TSPasswordCreds.java | 76 +
.../java/rdpclient/ntlmssp/asn1/TSRequest.java | 201 +
.../ntlmssp/asn1/TSSmartCardCreds.java | 90 +
.../java/rdpclient/ntlmssp/package-info.java | 71 +
.../rdpclient/rdp/ClientConfirmActivePDU.java | 1131 +++
.../java/rdpclient/rdp/ClientFastPathPDU.java | 55 +
.../main/java/rdpclient/rdp/ClientInfoPDU.java | 456 +
.../rdp/ClientMCSAttachUserRequest.java | 103 +
...lJoinRequestServerMCSChannelConfirmPDUs.java | 223 +
.../rdpclient/rdp/ClientMCSConnectInitial.java | 696 ++
.../rdp/ClientMCSErectDomainRequest.java | 189 +
.../rdpclient/rdp/ClientSynchronizePDU.java | 248 +
.../src/main/java/rdpclient/rdp/ClientTpkt.java | 54 +
.../rdp/ClientX224ConnectionRequestPDU.java | 162 +
.../java/rdpclient/rdp/ClientX224DataPDU.java | 52 +
.../rdpclient/rdp/RLEBitmapDecompression.java | 1014 ++
.../main/java/rdpclient/rdp/RdpConstants.java | 91 +
.../src/main/java/rdpclient/rdp/RdpState.java | 33 +
.../java/rdpclient/rdp/ServerBitmapUpdate.java | 199 +
.../rdp/ServerControlPDUCooperate.java | 117 +
.../rdp/ServerControlPDUGrantedControl.java | 114 +
.../rdpclient/rdp/ServerDemandActivePDU.java | 660 ++
.../main/java/rdpclient/rdp/ServerFastPath.java | 315 +
.../rdpclient/rdp/ServerIOChannelRouter.java | 534 +
.../rdp/ServerLicenseErrorPDUValidClient.java | 121 +
.../rdp/ServerMCSAttachUserConfirmPDU.java | 116 +
.../rdp/ServerMCSChannelJoinConfirmPDU.java | 89 +
.../rdpclient/rdp/ServerMCSConnectResponse.java | 283 +
.../main/java/rdpclient/rdp/ServerMCSPDU.java | 149 +
.../java/rdpclient/rdp/ServerPaletteUpdate.java | 77 +
.../rdpclient/rdp/ServerSynchronizePDU.java | 115 +
.../src/main/java/rdpclient/rdp/ServerTpkt.java | 70 +
.../rdp/ServerX224ConnectionConfirmPDU.java | 234 +
.../java/rdpclient/rdp/ServerX224DataPdu.java | 64 +
.../main/java/streamer/AssertingByteBuffer.java | 107 -
.../src/main/java/streamer/BaseElement.java | 98 +-
.../src/main/java/streamer/BufferPool.java | 0
.../src/main/java/streamer/ByteBuffer.java | 466 +-
.../src/main/java/streamer/DataSink.java | 0
.../src/main/java/streamer/DataSource.java | 0
.../src/main/java/streamer/Direction.java | 0
.../src/main/java/streamer/Element.java | 2 +-
.../src/main/java/streamer/Event.java | 3 +-
.../src/main/java/streamer/FakeSink.java | 69 -
.../src/main/java/streamer/FakeSource.java | 125 -
.../main/java/streamer/InputStreamSource.java | 36 +-
.../rdpconsole/src/main/java/streamer/Link.java | 0
.../src/main/java/streamer/MockSink.java | 113 -
.../src/main/java/streamer/MockSource.java | 89 -
.../src/main/java/streamer/OneTimeSwitch.java | 3 +
.../src/main/java/streamer/Order.java | 0
.../main/java/streamer/OutputStreamSink.java | 42 +-
.../src/main/java/streamer/Pipeline.java | 2 +
.../src/main/java/streamer/PipelineImpl.java | 77 +-
.../src/main/java/streamer/Queue.java | 28 +-
.../src/main/java/streamer/SocketWrapper.java | 216 +-
.../main/java/streamer/SocketWrapperImpl.java | 249 +
.../src/main/java/streamer/SyncLink.java | 123 +-
.../main/java/streamer/apr/AprSocketSink.java | 129 +
.../main/java/streamer/apr/AprSocketSource.java | 171 +
.../java/streamer/apr/AprSocketWrapperImpl.java | 281 +
.../java/streamer/bco/BcoSocketWrapperImpl.java | 119 +
.../streamer/debug/AssertingByteBuffer.java | 109 +
.../src/main/java/streamer/debug/Dumper.java | 28 +
.../src/main/java/streamer/debug/FakeSink.java | 77 +
.../main/java/streamer/debug/FakeSource.java | 138 +
.../main/java/streamer/debug/MockServer.java | 203 +
.../src/main/java/streamer/debug/MockSink.java | 154 +
.../main/java/streamer/debug/MockSource.java | 95 +
.../src/main/java/streamer/ssl/SSLState.java | 26 +
.../streamer/ssl/TrustAllX509TrustManager.java | 52 +
.../java/streamer/ssl/UpgradeSocketToSSL.java | 44 +
.../vncclient/AwtKeyboardEventToVncAdapter.java | 368 -
.../vncclient/AwtMouseEventToVncAdapter.java | 71 -
.../main/java/vncclient/EncodingsMessage.java | 63 -
.../vncclient/FrameBufferUpdateRequest.java | 126 -
.../vncclient/RGB888LE32PixelFormatRequest.java | 89 -
.../src/main/java/vncclient/RfbConstants.java | 85 -
.../java/vncclient/Vnc33Authentication.java | 292 -
.../src/main/java/vncclient/Vnc33Hello.java | 116 -
.../src/main/java/vncclient/VncClient.java | 58 +-
.../src/main/java/vncclient/VncInitializer.java | 245 -
.../main/java/vncclient/VncMessageHandler.java | 420 -
.../adapter/AwtVncKeyboardAdapter.java | 369 +
.../vncclient/adapter/AwtVncMouseAdapter.java | 71 +
.../java/vncclient/vnc/EncodingsMessage.java | 63 +
.../vncclient/vnc/FrameBufferUpdateRequest.java | 126 +
.../vnc/RGB888LE32PixelFormatRequest.java | 89 +
.../main/java/vncclient/vnc/RfbConstants.java | 85 +
.../java/vncclient/vnc/Vnc33Authentication.java | 292 +
.../src/main/java/vncclient/vnc/Vnc33Hello.java | 116 +
.../main/java/vncclient/vnc/VncInitializer.java | 245 +
.../java/vncclient/vnc/VncMessageHandler.java | 420 +
.../src/main/resources/jaas_ntlm_config.txt | 21 +
.../rdpconsole/src/test/doc/README.txt | 2 +
.../rdpconsole/src/test/doc/dev-rdp-config.bat | 13 +
.../src/test/doc/freerdp-debug-log.txt | 772 ++
.../rdpconsole/src/test/doc/rdp.pfx | Bin 0 -> 2572 bytes
.../src/test/java/rdpclient/MockServerTest.java | 9 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 2 +
.../consoleproxy/ConsoleProxyClientBase.java | 6 +-
.../consoleproxy/ConsoleProxyClientParam.java | 10 +-
.../ConsoleProxyHttpHandlerHelper.java | 3 +
.../resource/NfsSecondaryStorageResource.java | 31 +-
.../storage/template/DownloadManagerImpl.java | 13 +-
setup/bindir/cloud-setup-databases.in | 7 +-
setup/db/db/schema-420to421.sql | 25 +-
setup/db/db/schema-421to430.sql | 59 +-
setup/db/db/schema-430to440.sql | 230 +
setup/db/templates.sql | 7 +-
systemvm/js/ajaxviewer.js | 10 +-
.../debian/config/etc/init.d/cloud-early-config | 16 +-
systemvm/patches/debian/config/root/firewall.sh | 3 +-
systemvm/scripts/ssvm-check.sh | 20 +-
.../component/test_add_remove_network.py | 6 +-
.../component/test_advancedsg_networks.py | 2420 +++--
test/integration/component/test_assign_vm.py | 2 +-
.../component/test_base_image_updation.py | 6 +-
test/integration/component/test_blocker_bugs.py | 4 +-
.../component/test_cpu_domain_limits.py | 2 +-
test/integration/component/test_cpu_limits.py | 2 +-
.../component/test_cpu_max_limits.py | 4 +-
.../component/test_cpu_project_limits.py | 2 +-
.../component/test_egress_fw_rules.py | 204 +-
test/integration/component/test_egress_rules.py | 114 +-
test/integration/component/test_haproxy.py | 6 +-
test/integration/component/test_ldap.py | 9 -
.../integration/component/test_memory_limits.py | 4 +-
.../component/test_mm_domain_limits.py | 2 +-
.../integration/component/test_mm_max_limits.py | 4 +-
.../component/test_mm_project_limits.py | 2 +-
.../component/test_non_contiguous_vlan.py | 199 +-
.../component/test_project_resources.py | 16 +-
.../component/test_reset_ssh_keypair.py | 2 +-
.../component/test_resource_limits.py | 89 +-
test/integration/component/test_routers.py | 25 +-
test/integration/component/test_snapshots.py | 5 +-
.../component/test_snapshots_improvement.py | 7 +-
test/integration/component/test_templates.py | 5 +-
test/integration/component/test_vmware_drs.py | 2 +-
test/integration/component/test_vpc_network.py | 162 +-
.../component/test_vpc_network_lbrules.py | 5 +-
.../component/test_vpc_network_pfrules.py | 33 +-
.../component/test_vpc_network_staticnatrule.py | 35 +-
.../integration/component/test_vpc_offerings.py | 12 +-
test/integration/component/test_vpn_users.py | 4 +-
.../smoke/test_deploy_vm_with_userdata.py | 7 +-
...deploy_vms_with_varied_deploymentplanners.py | 4 +-
test/integration/smoke/test_guest_vlan_range.py | 53 +-
.../integration/smoke/test_service_offerings.py | 19 +-
tools/apidoc/gen_toc.py | 2 +-
.../systemvm64template/postinstall.sh | 8 +-
.../definitions/systemvmtemplate/postinstall.sh | 3 +
tools/build/build_asf.sh | 9 +-
tools/checkstyle/pom.xml | 43 +
.../src/main/resources/cloud-style.xml | 55 +
tools/marvin/marvin/config/config.cfg | 159 +
tools/marvin/marvin/configGenerator.py | 5 +-
tools/marvin/marvin/integration/lib/base.py | 2 +
tools/marvin/marvin/integration/lib/common.py | 193 +-
tools/marvin/marvin/integration/lib/utils.py | 56 +-
ui/css/cloudstack3.css | 91 +-
ui/dictionary.jsp | 20 +
ui/images/infrastructure-icons.png | Bin 40266 -> 62257 bytes
ui/index.jsp | 6 +-
ui/scripts/accounts.js | 44 +-
ui/scripts/accountsWizard.js | 2 +-
ui/scripts/affinity.js | 3 +-
ui/scripts/configuration.js | 6 +-
ui/scripts/events.js | 3 +-
ui/scripts/globalSettings.js | 33 +-
ui/scripts/instances.js | 11 +-
ui/scripts/network.js | 37 +-
ui/scripts/sharedFunctions.js | 20 +-
ui/scripts/storage.js | 66 +-
ui/scripts/system.js | 9348 +++++++++---------
ui/scripts/templates.js | 56 +-
ui/scripts/ui-custom/accountsWizard.js | 9 +-
ui/scripts/ui-custom/zoneWizard.js | 5 +-
ui/scripts/ui/widgets/detailView.js | 8 +-
ui/scripts/ui/widgets/multiEdit.js | 2 +
ui/scripts/ui/widgets/tagger.js | 6 +-
ui/scripts/vpc.js | 10 +-
ui/scripts/zoneWizard.js | 6 +-
usage/pom.xml | 58 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 60 +-
.../src/com/cloud/usage/UsageSanityChecker.java | 356 +-
.../com/cloud/usage/UsageSanityCheckerIT.java | 159 +
.../com/cloud/usage/UsageSanityCheckerTest.java | 68 +
.../test/resources/UsageManagerTestContext.xml | 20 +-
usage/test/resources/cloud1.xml | 24 +
usage/test/resources/cloud2.xml | 24 +
usage/test/resources/cloud3.xml | 13 +
usage/test/resources/cloud_usage1.xml | 26 +
usage/test/resources/cloud_usage2.xml | 43 +
usage/test/resources/cloud_usage3.xml | 13 +
utils/src/com/cloud/utils/UriUtils.java | 2 +
.../utils/exception/CloudRuntimeException.java | 49 +-
.../utils/exception/ExceptionProxyObject.java | 14 +-
utils/src/com/cloud/utils/net/NetUtils.java | 56 +-
utils/src/com/cloud/utils/nio/Link.java | 17 +-
.../test/com/cloud/utils/net/NetUtilsTest.java | 10 +
.../cloud/hypervisor/vmware/mo/ClusterMO.java | 5 +
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 10 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 28 +-
.../vmware/mo/VmwareHypervisorHost.java | 2 +
.../hypervisor/vmware/util/VmwareClient.java | 29 +-
725 files changed, 49005 insertions(+), 24247 deletions(-)
----------------------------------------------------------------------