cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [19/50] [abbrv] git commit: updated refs/heads/ui-restyle to 326b3a6
Date Tue, 10 Dec 2013 23:51:59 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/0fb66981
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fb66981
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fb66981

Branch: refs/heads/ui-restyle
Commit: 0fb669811d962a9ebcdff4a172f73a7660afaca9
Parents: c05482b 267ff79
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Dec 9 13:11:11 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Dec 9 13:11:11 2013 -0800

----------------------------------------------------------------------
 .gitignore                                      |    2 +-
 agent/src/com/cloud/agent/AgentShell.java       |   14 +-
 api/src/com/cloud/alert/Alert.java              |    1 +
 api/src/com/cloud/event/EventTypes.java         |    6 +
 api/src/com/cloud/network/Network.java          |    2 +
 api/src/com/cloud/network/OvsProvider.java      |   10 +
 .../element/VirtualRouterElementService.java    |    6 +
 .../com/cloud/network/lb/LoadBalancingRule.java |    8 +-
 .../cloud/network/vpc/NetworkACLService.java    |    8 +-
 api/src/com/cloud/server/ResourceTag.java       |   32 +-
 api/src/com/cloud/storage/VolumeApiService.java |    2 +-
 .../com/cloud/user/ResourceLimitService.java    |   36 +
 api/src/com/cloud/vm/UserVmService.java         |   43 +-
 .../apache/cloudstack/alert/AlertService.java   |  103 +
 .../org/apache/cloudstack/api/ApiConstants.java |   15 +-
 .../api/BaseAsyncCreateCustomIdCmd.java         |   27 +
 .../cloudstack/api/BaseAsyncCustomIdCmd.java    |   27 +
 api/src/org/apache/cloudstack/api/BaseCmd.java  |   11 +-
 .../apache/cloudstack/api/BaseCustomIdCmd.java  |   27 +
 .../cloudstack/api/ResponseGenerator.java       |    4 +
 .../command/admin/alert/GenerateAlertCmd.java   |  123 +
 .../command/admin/resource/ListAlertsCmd.java   |   11 +-
 .../admin/router/ConfigureOvsElementCmd.java    |  116 +
 .../admin/router/ListOvsElementsCmd.java        |   91 +
 .../admin/systemvm/ScaleSystemVMCmd.java        |   25 +
 .../admin/systemvm/UpgradeSystemVMCmd.java      |   25 +
 .../user/config/ListCapabilitiesCmd.java        |    1 +
 .../user/network/ListNetworkACLListsCmd.java    |    9 +-
 .../user/network/ListNetworkACLsCmd.java        |    3 +-
 .../api/command/user/vm/DeployVMCmd.java        |   67 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |    2 +-
 .../api/command/user/vm/ScaleVMCmd.java         |   29 +
 .../api/command/user/vm/UpdateVMCmd.java        |    3 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |   25 +
 .../command/user/volume/CreateVolumeCmd.java    |   15 +-
 .../command/user/volume/UpdateVolumeCmd.java    |    5 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |   69 +-
 .../cloudstack/api/response/AlertResponse.java  |    7 +
 .../api/response/CapabilitiesResponse.java      |    8 +
 .../api/response/OvsProviderResponse.java       |   77 +
 .../api/response/ServiceOfferingResponse.java   |   21 +-
 .../cloud/bridge/service/EC2RestServlet.java    |   46 +-
 .../service/controller/s3/ServiceProvider.java  |   15 +-
 .../bridge/service/core/ec2/EC2Engine.java      |   65 +-
 .../classes/resources/messages.properties       |    2 +-
 .../classes/resources/messages_ja.properties    |   66 +-
 .../classes/resources/messages_zh_CN.properties |   46 +-
 client/tomcatconf/commands.properties.in        |    8 +-
 .../src/com/cloud/agent/api/MigrateCommand.java |    6 +-
 core/src/com/cloud/agent/api/StopAnswer.java    |   25 +-
 .../src/com/cloud/vm/VirtualMachineManager.java |    6 +-
 .../service/VolumeOrchestrationService.java     |    3 +-
 .../src/com/cloud/alert/AlertManager.java       |   43 +-
 .../src/com/cloud/capacity/CapacityManager.java |    9 +
 .../src/com/cloud/event/UsageEventUtils.java    |    7 +-
 ...spring-engine-orchestration-core-context.xml |   14 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |   10 +-
 .../manager/ClusteredAgentManagerImpl.java      |  113 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 1071 +++----
 .../cloud/entity/api/VMEntityManagerImpl.java   |    1 +
 .../orchestration/NetworkOrchestrator.java      |   20 +-
 .../orchestration/VolumeOrchestrator.java       |   75 +-
 .../spring-engine-schema-core-daos-context.xml  |    9 +-
 engine/schema/src/com/cloud/alert/AlertVO.java  |   18 +-
 .../src/com/cloud/event/UsageEventVO.java       |    4 +
 .../event/dao/UsageEventDetailsDaoImpl.java     |   46 +-
 .../com/cloud/network/dao/OvsProviderDao.java   |   14 +
 .../cloud/network/dao/OvsProviderDaoImpl.java   |   57 +
 .../com/cloud/network/dao/SslCertDaoImpl.java   |    2 +-
 .../cloud/network/element/OvsProviderVO.java    |   83 +
 .../com/cloud/service/ServiceOfferingVO.java    |   28 +-
 .../cloud/service/dao/ServiceOfferingDao.java   |    3 +-
 .../service/dao/ServiceOfferingDaoImpl.java     |   34 +-
 .../src/com/cloud/storage/DiskOfferingVO.java   |   16 +
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |    4 +
 .../src/com/cloud/usage/UsageVMInstanceVO.java  |   34 +
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |    4 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |    6 +-
 .../resourcedetail/NetworkACLItemDetailVO.java  |   82 +
 .../resourcedetail/NetworkACLListDetailVO.java  |   82 +
 .../resourcedetail/ResourceDetailsDaoBase.java  |    1 +
 .../cloudstack/resourcedetail/VpcDetailVO.java  |   81 +
 .../resourcedetail/VpcGatewayDetailVO.java      |   81 +
 .../dao/NetworkACLItemDetailsDao.java           |   26 +
 .../dao/NetworkACLItemDetailsDaoImpl.java       |   33 +
 .../dao/NetworkACLListDetailsDao.java           |   26 +
 .../dao/NetworkACLListDetailsDaoImpl.java       |   33 +
 .../resourcedetail/dao/VpcDetailsDao.java       |   26 +
 .../resourcedetail/dao/VpcDetailsDaoImpl.java   |   33 +
 .../dao/VpcGatewayDetailsDao.java               |   27 +
 .../dao/VpcGatewayDetailsDaoImpl.java           |   33 +
 .../storage/image/TemplateServiceImpl.java      |    2 +-
 .../snapshot/XenserverSnapshotStrategy.java     |    2 +-
 .../datastore/provider/DefaultHostListener.java |    2 +-
 .../storage/volume/VolumeServiceImpl.java       |    7 +-
 .../com/cloud/cluster/ClusterManagerImpl.java   |   40 +-
 .../serializer/OnwireClassRegistry.java         |    8 +-
 framework/rest/.gitignore                       |    1 +
 .../DotNet/ServerResource/.nuget/NuGet.targets  |   48 +-
 .../ServerResource/AgentShell/AgentShell.csproj |    9 +-
 .../DotNet/ServerResource/AgentShell/Program.cs |  174 +-
 .../AgentShell/ProjectInstaller.Designer.cs     |   76 +
 .../AgentShell/ProjectInstaller.cs              |   35 +
 .../HypervResource/CloudStackTypes.cs           |  184 +-
 .../HypervResource/HypervResource.csproj        |    1 +
 .../HypervResource/HypervResourceController.cs  |  210 +-
 .../HypervResource/IWmiCallsV2.cs               |    1 +
 .../ServerResource/HypervResource/WmiCallsV2.cs |  160 +-
 .../ROOT.virtualization.v2.Msvm_MigrationJob.cs | 1867 +++++++++++
 .../ROOT.virtualization.v2.Msvm_StorageJob.cs   | 1863 +++++++++++
 ...ion.v2.Msvm_VirtualSystemMigrationService.cs | 1581 +++++++++
 ...v2.Msvm_VirtualSystemMigrationSettingData.cs |  915 ++++++
 .../WmiWrappers/WmiWrappers.csproj              |   14 +-
 .../discoverer/HypervServerDiscoverer.java      |    5 +-
 .../resource/HypervDirectConnectResource.java   |    5 +-
 plugins/hypervisors/kvm/pom.xml                 |    5 +
 .../kvm/resource/LibvirtComputingResource.java  |  209 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    7 +
 .../vmware/VmwareServerDiscoverer.java          |    2 +-
 .../resource/VmwareStorageProcessor.java        |    4 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |   20 +-
 .../xen/resource/CitrixResourceBase.java        |  196 +-
 .../xen/resource/XenServer610Resource.java      |   14 -
 .../xen/resource/XenServerPoolVms.java          |    6 +-
 .../xen/resource/CitrixResourceBaseTest.java    |    1 +
 .../cloudstack/cisco-vnmc/module.properties     |   18 +
 .../cisco-vnmc/spring-cisco-vnmc-context.xml    |   40 +
 .../META-INF/cloudstack/f5/module.properties    |   18 +
 .../cloudstack/f5/spring-f5-context.xml         |   34 +
 .../management/ManagementNetworkGuru.java       |   31 +-
 .../contrail/management/ServiceManagerImpl.java |   16 +-
 .../contrail/model/VirtualMachineModel.java     |   68 +-
 .../META-INF/cloudstack/srx/module.properties   |   18 +
 .../cloudstack/srx/spring-srx-context.xml       |   35 +
 .../network/resource/JuniperSrxResource.java    |    2 +-
 .../cloudstack/netscaler/module.properties      |   18 +
 .../netscaler/spring-netscaler-context.xml      |   35 +
 .../network/resource/NetscalerResource.java     |  240 +-
 .../cloudstack/ovs/spring-ovs-context.xml       |    2 +
 .../agent/api/OvsCreateGreTunnelAnswer.java     |   81 +
 .../agent/api/OvsCreateGreTunnelCommand.java    |   55 +
 .../cloud/agent/api/OvsCreateTunnelAnswer.java  |   85 +
 .../cloud/agent/api/OvsCreateTunnelCommand.java |   70 +
 .../cloud/agent/api/OvsDeleteFlowCommand.java   |   36 +
 .../agent/api/OvsDestroyBridgeCommand.java      |   44 +
 .../agent/api/OvsDestroyTunnelCommand.java      |   50 +
 .../agent/api/OvsFetchInterfaceAnswer.java      |   58 +
 .../agent/api/OvsFetchInterfaceCommand.java     |   38 +
 .../cloud/agent/api/OvsSetTagAndFlowAnswer.java |   40 +
 .../agent/api/OvsSetTagAndFlowCommand.java      |   61 +
 .../cloud/agent/api/OvsSetupBridgeCommand.java  |   49 +
 .../com/cloud/agent/api/StartupOvsCommand.java  |   27 +
 .../com/cloud/network/element/OvsElement.java   |  658 +++-
 .../network/element/OvsElementService.java      |    7 +
 .../cloud/network/guru/OvsGuestNetworkGuru.java |  243 +-
 .../network/ovs/OvsCreateGreTunnelAnswer.java   |   79 -
 .../network/ovs/OvsCreateGreTunnelCommand.java  |   54 -
 .../network/ovs/OvsCreateTunnelAnswer.java      |   83 -
 .../network/ovs/OvsCreateTunnelCommand.java     |   69 -
 .../cloud/network/ovs/OvsDeleteFlowCommand.java |   36 -
 .../network/ovs/OvsDestroyBridgeCommand.java    |   45 -
 .../network/ovs/OvsDestroyTunnelCommand.java    |   50 -
 .../network/ovs/OvsFetchInterfaceAnswer.java    |   57 -
 .../network/ovs/OvsFetchInterfaceCommand.java   |   38 -
 .../network/ovs/OvsSetTagAndFlowAnswer.java     |   40 -
 .../network/ovs/OvsSetTagAndFlowCommand.java    |   60 -
 .../network/ovs/OvsSetupBridgeCommand.java      |   50 -
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |  447 +--
 .../driver/CloudStackImageStoreDriverImpl.java  |    7 +-
 .../CloudStackImageStoreLifeCycleImpl.java      |    6 +-
 .../provider/SolidFireHostListener.java         |    2 +-
 .../api/command/LdapImportUsersCmd.java         |   37 +-
 .../storage/secondary/cloud-install-sys-tmplt   |    8 +-
 .../xenserver/copy_vhd_from_secondarystorage.sh |    2 +-
 .../xenserver/copy_vhd_to_secondarystorage.sh   |    5 +-
 .../create_privatetemplate_from_snapshot.sh     |    2 +-
 scripts/vm/hypervisor/xenserver/launch_hb.sh    |    4 +-
 scripts/vm/hypervisor/xenserver/ovs-pvlan       |   10 +-
 scripts/vm/hypervisor/xenserver/ovstunnel       |   55 +-
 .../xenserver/setup_heartbeat_file.sh           |    2 +-
 .../vm/hypervisor/xenserver/setupxenserver.sh   |    2 +-
 scripts/vm/hypervisor/xenserver/swiftxen        |    2 +-
 .../vm/hypervisor/xenserver/upgrade_snapshot.sh |    2 +-
 scripts/vm/hypervisor/xenserver/vhd-util        |  Bin 0 -> 318977 bytes
 scripts/vm/hypervisor/xenserver/vmops           |   68 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot   |   10 +-
 scripts/vm/hypervisor/xenserver/vmopspremium    |   21 +-
 .../xcposs/copy_vhd_from_secondarystorage.sh    |  188 --
 .../xcposs/copy_vhd_to_secondarystorage.sh      |  130 -
 .../create_privatetemplate_from_snapshot.sh     |  138 -
 scripts/vm/hypervisor/xenserver/xcposs/patch    |   72 +-
 scripts/vm/hypervisor/xenserver/xcposs/vmops    | 1493 ---------
 .../hypervisor/xenserver/xcposs/vmopsSnapshot   |  601 ----
 .../vm/hypervisor/xenserver/xcposs/vmopspremium |  146 -
 scripts/vm/hypervisor/xenserver/xcpserver/patch |   62 +-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh |    2 +-
 .../vm/hypervisor/xenserver/xenserver56/patch   |   61 +-
 .../hypervisor/xenserver/xenserver56fp1/patch   |   62 +-
 .../vm/hypervisor/xenserver/xenserver60/patch   |   68 +-
 scripts/vm/network/vnet/cloudstack_pluginlib.py |  219 ++
 scripts/vm/network/vnet/ovstunnel.py            |  225 ++
 .../spring-server-core-managers-context.xml     |    6 +-
 .../allocator/impl/FirstFitAllocator.java       |   11 +-
 .../src/com/cloud/alert/AlertManagerImpl.java   |  195 +-
 .../com/cloud/alert/ClusterAlertAdapter.java    |    4 +-
 .../cloud/alert/ConsoleProxyAlertAdapter.java   |   14 +-
 .../alert/SecondaryStorageVmAlertAdapter.java   |   14 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   18 +
 .../src/com/cloud/api/doc/ApiXmlDocWriter.java  |   19 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |    2 +-
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |    2 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |    1 +
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |    8 +-
 .../api/query/vo/ServiceOfferingJoinVO.java     |   16 +-
 .../com/cloud/capacity/CapacityManagerImpl.java |   29 +-
 server/src/com/cloud/configuration/Config.java  |   20 +-
 .../configuration/ConfigurationManagerImpl.java |   11 +-
 .../cloud/consoleproxy/ConsoleProxyManager.java |    1 +
 .../deploy/DeploymentPlanningManagerImpl.java   |   26 +-
 .../src/com/cloud/event/ActionEventUtils.java   |   29 +-
 .../ha/HighAvailabilityManagerExtImpl.java      |    4 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |   20 +-
 .../metadata/ResourceMetaDataManagerImpl.java   |   26 +-
 .../com/cloud/network/IpAddressManagerImpl.java |    7 +-
 .../src/com/cloud/network/NetworkModelImpl.java |   13 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   65 +-
 .../network/element/VirtualRouterElement.java   |   67 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |   25 -
 .../lb/LoadBalancingRulesManagerImpl.java       |    7 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   23 +-
 .../network/vpc/NetworkACLServiceImpl.java      |  111 +-
 .../com/cloud/resource/ResourceManagerImpl.java |    2 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |   55 +-
 .../cloud/server/ConfigurationServerImpl.java   |  159 +-
 .../com/cloud/server/ManagementServerImpl.java  |   53 +-
 server/src/com/cloud/server/StatsCollector.java |    5 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |  131 +-
 .../storage/download/DownloadMonitorImpl.java   |    2 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |    2 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |   12 +
 .../cloud/storage/upload/UploadMonitorImpl.java |    2 +-
 .../cloud/tags/TaggedResourceManagerImpl.java   |   13 +-
 .../template/HypervisorTemplateAdapter.java     |    4 +
 .../com/cloud/template/TemplateManagerImpl.java |   46 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |  168 +-
 .../src/com/cloud/uuididentity/UUIDManager.java |   38 +
 .../com/cloud/uuididentity/UUIDManagerImpl.java |  102 +
 .../src/com/cloud/vm/SystemVmLoadScanner.java   |   15 +-
 server/src/com/cloud/vm/UserVmManager.java      |   14 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  322 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |    7 +-
 .../com/cloud/alert/MockAlertManagerImpl.java   |   10 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |    6 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java |   21 +
 .../com/cloud/vpc/NetworkACLServiceTest.java    |    8 +
 .../com/cloud/consoleproxy/ConsoleProxy.java    |   21 +-
 setup/db/create-schema.sql                      |    1 +
 setup/db/db/schema-410to420.sql                 |   12 +
 setup/db/db/schema-420to421.sql                 |    2 +
 setup/db/db/schema-421to430.sql                 |   50 +
 setup/db/db/schema-430to440.sql                 |    4 +-
 setup/dev/advanced.cfg                          |   10 +-
 setup/dev/advancedsg.cfg                        |   14 +-
 setup/dev/basic.cfg                             |   10 +-
 .../config/opt/cloud/bin/monitor_service.sh     |    2 +-
 .../debian/config/root/monitorServices.py       |  304 +-
 .../component/test_add_remove_network.py        | 1785 +++++++++++
 .../component/test_custom_hostname.py           |  127 +-
 .../component/test_egress_fw_rules.py           |   17 +-
 .../component/test_project_limits.py            |   18 +-
 .../component/test_project_resources.py         |   72 +-
 .../component/test_shared_networks.py           |    4 +-
 test/integration/component/test_snapshots.py    |   20 +-
 .../component/test_vpc_vm_life_cycle.py         |   21 +-
 .../component/test_vpc_vms_deployment.py        |  277 +-
 tools/apidoc/gen_toc.py                         |    3 +-
 .../systemvm64template/postinstall.sh           |    9 +
 tools/devcloud/devcloud.cfg                     |   12 +-
 tools/marvin/marvin/cloudstackConnection.py     |   53 +-
 tools/marvin/marvin/codes.py                    |    5 +
 tools/marvin/marvin/config/setup.cfg            |   10 +-
 tools/marvin/marvin/configGenerator.py          |   48 -
 tools/marvin/marvin/deployDataCenter.py         |   58 +-
 tools/marvin/marvin/integration/lib/base.py     |   11 +-
 tools/marvin/marvin/marvinInit.py               |  159 +
 tools/marvin/marvin/marvinLog.py                |   73 +
 tools/marvin/marvin/marvinPlugin.py             |  193 +-
 tools/marvin/marvin/misc/build/CI.md            |  160 +
 tools/marvin/marvin/misc/build/README.md        |   49 +
 tools/marvin/marvin/misc/build/advanced_env.py  |  207 ++
 tools/marvin/marvin/misc/build/asf_test.cfg     |  162 +
 tools/marvin/marvin/misc/build/bashUtils.py     |  130 +
 .../marvin/marvin/misc/build/buildGenerator.py  |  152 +
 tools/marvin/marvin/misc/build/configure.py     |  394 +++
 tools/marvin/marvin/misc/build/hudson.sh        |   73 +
 tools/marvin/marvin/misc/build/kvm.cfg          |  225 ++
 tools/marvin/marvin/misc/build/kvm.properties   |   86 +
 tools/marvin/marvin/misc/build/openport.py      |   14 +
 tools/marvin/marvin/misc/build/redeploy.sh      |  108 +
 tools/marvin/marvin/misc/build/restartMgmt.py   |   36 +
 .../marvin/marvin/misc/build/system.properties  |   25 +
 .../marvin/misc/build/testSetupSuccess.py       |   64 +
 tools/marvin/marvin/misc/build/vm-start.sh      |   38 +
 tools/marvin/marvin/misc/build/vm-uninstall.sh  |   27 +
 tools/marvin/marvin/misc/build/xen.cfg          |  225 ++
 tools/marvin/marvin/misc/build/xen.properties   |   86 +
 tools/marvin/marvin/misc/build/xunitmp/setup.py |   46 +
 .../misc/build/xunitmp/xunitmultiprocess.py     |  274 ++
 tools/marvin/setup.py                           |    3 +-
 ui/css/cloudstack3.css                          |   37 +-
 ui/css/cloudstack3.ja.css                       |   20 +-
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  |    3 -
 ui/scripts/accounts.js                          |  163 +-
 ui/scripts/docs.js                              |    8 +
 ui/scripts/instanceWizard.js                    |  147 +-
 ui/scripts/instances.js                         |  116 +-
 ui/scripts/network.js                           |    3 -
 ui/scripts/storage.js                           |   44 +-
 ui/scripts/system.js                            | 3024 +++++++++---------
 ui/scripts/templates.js                         |   28 +-
 ui/scripts/ui-custom/enableStaticNAT.js         |    2 +
 ui/scripts/ui/dialog.js                         |    2 +-
 ui/scripts/ui/widgets/detailView.js             |   29 +-
 ui/scripts/ui/widgets/listView.js               |    6 +
 ui/scripts/zoneWizard.js                        |  346 +-
 .../com/cloud/usage/UsageAlertManagerImpl.java  |   49 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java |   44 +-
 utils/src/com/cloud/utils/StringUtils.java      |   30 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |   22 +
 utils/src/com/cloud/utils/nio/Link.java         |    9 +-
 .../cloud/utils/security/CertificateHelper.java |   56 +
 utils/test/com/cloud/utils/StringUtilsTest.java |    8 +
 .../mo/VirtualMachineDiskInfoBuilder.java       |    2 +-
 .../hypervisor/vmware/util/VmwareClient.java    |   33 +-
 .../vmware/util/VmwareGuestOsMapper.java        |   17 +-
 335 files changed, 22309 insertions(+), 8283 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fb66981/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fb66981/ui/scripts/ui/dialog.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fb66981/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fb66981/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------


Mime
View raw message