You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/05/03 15:14:50 UTC
[08/50] [abbrv] git commit: updated refs/heads/network_acl to 1609d01
Merge branch 'master' into ui-granular-settings
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1de600c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1de600c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1de600c
Branch: refs/heads/network_acl
Commit: c1de600cb458d9e3fe12b773a5e09b7e495a09fd
Parents: b54f643 4c7e0b3
Author: Brian Federle <br...@citrix.com>
Authored: Wed May 1 14:45:05 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed May 1 14:45:05 2013 -0700
----------------------------------------------------------------------
CHANGES | 385 +-
README.md | 6 +-
agent/conf/agent.properties | 2 +-
.../cloud/agent/api/MigrateWithStorageAnswer.java | 39 +
.../cloud/agent/api/MigrateWithStorageCommand.java | 45 +
.../api/MigrateWithStorageCompleteAnswer.java | 38 +
.../api/MigrateWithStorageCompleteCommand.java | 36 +
.../agent/api/MigrateWithStorageReceiveAnswer.java | 55 +
.../api/MigrateWithStorageReceiveCommand.java | 45 +
.../agent/api/MigrateWithStorageSendAnswer.java | 39 +
.../agent/api/MigrateWithStorageSendCommand.java | 58 +
.../com/cloud/agent/api/UnregisterVMCommand.java | 34 +
.../agent/api/storage/MigrateVolumeAnswer.java | 38 +
.../agent/api/storage/MigrateVolumeCommand.java | 51 +
.../cloud/configuration/ConfigurationService.java | 15 +-
.../cloud/hypervisor/HypervisorCapabilities.java | 2 +
api/src/com/cloud/hypervisor/HypervisorGuru.java | 9 +
api/src/com/cloud/network/IpAddress.java | 9 -
api/src/com/cloud/network/NetworkModel.java | 2 +-
api/src/com/cloud/network/NetworkService.java | 4 +-
api/src/com/cloud/network/PhysicalNetwork.java | 5 +-
api/src/com/cloud/network/PublicIpAddress.java | 3 -
api/src/com/cloud/network/element/IpDeployer.java | 6 +-
.../region/ha/GlobalLoadBalancingRulesService.java | 3 +
api/src/com/cloud/server/ManagementService.java | 21 +-
api/src/com/cloud/user/Account.java | 4 +
api/src/com/cloud/user/User.java | 2 +
api/src/com/cloud/vm/UserVmService.java | 56 +-
.../cloudstack/affinity/AffinityGroupResponse.java | 5 +-
.../org/apache/cloudstack/api/ApiConstants.java | 7 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 24 +
.../apache/cloudstack/api/ResponseGenerator.java | 10 +-
.../command/admin/account/CreateAccountCmd.java | 14 +-
.../api/command/admin/cluster/ListClustersCmd.java | 8 +-
.../api/command/admin/config/ListCfgsByCmd.java | 44 +-
.../admin/config/ListDeploymentPlannersCmd.java | 71 -
.../api/command/admin/config/UpdateCfgCmd.java | 43 +-
.../admin/host/FindHostsForMigrationCmd.java | 107 +
.../api/command/admin/host/ListHostsCmd.java | 14 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 8 +-
.../admin/offering/CreateServiceOfferingCmd.java | 6 -
.../api/command/admin/pod/ListPodsByCmd.java | 7 +
.../api/command/admin/router/ListRoutersCmd.java | 7 +
.../storage/FindStoragePoolsForMigrationCmd.java | 98 +
.../command/admin/storage/ListStoragePoolsCmd.java | 7 +
.../command/admin/systemvm/ListSystemVMsCmd.java | 7 +
.../api/command/admin/vm/MigrateVMCmd.java | 2 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 160 +
.../api/command/user/iso/ListIsosCmd.java | 7 +
.../api/command/user/network/ListNetworksCmd.java | 7 +
.../command/user/snapshot/ListSnapshotsCmd.java | 7 +
.../api/command/user/tag/CreateTagsCmd.java | 2 +-
.../api/command/user/tag/DeleteTagsCmd.java | 2 +-
.../api/command/user/tag/ListTagsCmd.java | 2 +-
.../command/user/template/ListTemplatesCmd.java | 8 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 9 +-
.../api/command/user/vm/DeployVMCmd.java | 17 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 21 +-
.../api/command/user/vm/UpdateVMCmd.java | 2 +-
.../api/command/user/volume/ListVolumesCmd.java | 7 +
.../api/command/user/volume/MigrateVolumeCmd.java | 8 +
.../api/command/user/zone/ListZonesByCmd.java | 8 +
.../cloudstack/api/response/AccountResponse.java | 7 +
.../cloudstack/api/response/ClusterResponse.java | 9 +-
.../api/response/ConfigurationResponse.java | 15 +
.../api/response/DomainRouterResponse.java | 11 +
.../api/response/GlobalLoadBalancerResponse.java | 10 +
.../api/response/HostForMigrationResponse.java | 365 +
.../cloudstack/api/response/HostResponse.java | 10 +-
.../cloudstack/api/response/NetworkResponse.java | 7 +
.../cloudstack/api/response/PodResponse.java | 9 +-
.../cloudstack/api/response/SnapshotResponse.java | 16 +
.../response/StoragePoolForMigrationResponse.java | 248 +
.../api/response/StoragePoolResponse.java | 18 +-
.../cloudstack/api/response/SystemVmResponse.java | 11 +
.../cloudstack/api/response/TemplateResponse.java | 7 +
.../cloudstack/api/response/UserResponse.java | 8 +
.../cloudstack/api/response/UserVmResponse.java | 7 +
.../cloudstack/api/response/VolumeResponse.java | 8 +
.../api/command/test/AddIpToVmNicTest.java | 6 +-
.../api/command/test/ListCfgCmdTest.java | 89 +
.../api/command/test/UpdateCfgCmdTest.java | 116 +
.../com/cloud/bridge/service/core/s3/S3Engine.java | 2 +-
.../WEB-INF/classes/resources/messages.properties | 1753 ++--
.../classes/resources/messages_ar.properties | 285 +
.../classes/resources/messages_ca.properties | 307 +
.../classes/resources/messages_de_DE.properties | 748 +
.../classes/resources/messages_es.properties | 862 ++
.../classes/resources/messages_fr_FR.properties | 1880 ++--
.../classes/resources/messages_it_IT.properties | 618 +
.../classes/resources/messages_ja.properties | 2904 ++--
.../classes/resources/messages_ko_KR.properties | 2883 ++--
.../classes/resources/messages_nb_NO.properties | 366 +
.../classes/resources/messages_pt_BR.properties | 2092 ++--
.../classes/resources/messages_ru_RU.properties | 2890 ++--
.../classes/resources/messages_zh_CN.properties | 2986 ++--
client/pom.xml | 11 +-
client/tomcatconf/applicationContext.xml.in | 8 +-
client/tomcatconf/commands.properties.in | 3 +
client/tomcatconf/nonossComponentContext.xml.in | 2 +-
core/src/com/cloud/async/AsyncJobVO.java | 1 +
.../cloud/hypervisor/HypervisorCapabilitiesVO.java | 24 +-
core/src/com/cloud/user/AccountVO.java | 7 +
core/src/com/cloud/user/UserVO.java | 11 +-
core/src/com/cloud/vm/UserVmVO.java | 6 +-
core/src/com/cloud/vm/VMInstanceVO.java | 1 -
debian/rules | 5 +-
docs/en-US/Common_Content/feedback.xml | 24 +
docs/en-US/Preface.xml | 2 +-
docs/en-US/Release_Notes.xml |11163 ++++++++-------
docs/en-US/about-working-with-vms.xml | 85 +-
docs/en-US/added-API-commands-4.2.xml | 24 +
docs/en-US/advanced-zone-configuration.xml | 2 +-
docs/en-US/advanced-zone-network-traffic-types.xml | 2 +-
docs/en-US/append-displayname-vms.xml | 84 +
docs/en-US/basic-zone-network-traffic-types.xml | 4 +-
docs/en-US/build-nonoss.xml | 49 +
docs/en-US/changed-API-commands-4.2.xml | 134 +
docs/en-US/creating-network-offerings.xml | 45 +
docs/en-US/delete-event-alerts.xml | 59 +
docs/en-US/elastic-ip.xml | 90 +
docs/en-US/events.xml | 5 +-
docs/en-US/feedback.xml | 24 +
docs/en-US/guest-ip-ranges.xml | 10 +-
docs/en-US/hypervisor-kvm-install-flow.xml | 2 +-
.../hypervisor-support-for-primarystorage.xml | 148 +-
docs/en-US/images/add-vlan-icon.png | Bin 0 -> 860 bytes
docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes
docs/en-US/limit-accounts-domains.xml | 371 +
docs/en-US/network-offerings.xml | 83 +-
docs/en-US/networks.xml | 1 +
docs/en-US/non-contiguous-vlan.xml | 68 +
docs/en-US/set-up-network-for-users.xml | 13 +-
docs/en-US/source-build.xml | 4 +-
docs/en-US/source.xml | 1 +
.../troubleshooting-working-with-server-logs.xml | 6 +-
docs/en-US/using-netscaler-load-balancers.xml | 132 +-
docs/en-US/virtual-machines.xml | 1 +
docs/en-US/vlan-provisioning.xml | 2 +
docs/en-US/vm-snapshots.xml | 10 +-
docs/en-US/work-with-usage.xml | 26 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 2 +
.../subsystem/api/storage/VolumeService.java | 7 +-
.../datastore/db/StoragePoolDetailsDao.java | 1 +
.../engine/cloud/entity/api/VMEntityManager.java | 2 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 53 +-
.../cloud/entity/api/VirtualMachineEntityImpl.java | 2 +-
.../cloudstack/storage/image/ImageServiceImpl.java | 85 +-
.../image/motion/DefaultImageMotionStrategy.java | 18 +
.../storage/test/MockStorageMotionStrategy.java | 19 +
.../storage/motion/AncientDataMotionStrategy.java | 89 +-
.../storage/motion/DataMotionService.java | 9 +
.../storage/motion/DataMotionServiceImpl.java | 16 +
.../storage/motion/DataMotionStrategy.java | 10 +
.../cloudstack/storage/volume/VolumeObject.java | 2 +
.../storage/volume/VolumeServiceImpl.java | 174 +-
.../framework/client/ClientEventBus.java | 4 +-
.../cloudstack/framework/eventbus/EventBus.java | 32 -
.../framework/eventbus/EventBusBase.java | 308 -
.../framework/eventbus/EventBusEndpoint.java | 61 -
.../framework/eventbus/EventDispatcher.java | 104 -
.../framework/eventbus/EventHandler.java | 30 -
.../framework/eventbus/PublishScope.java | 24 -
.../cloudstack/framework/eventbus/Subscriber.java | 24 -
.../framework/messagebus/MessageBus.java | 34 +
.../framework/messagebus/MessageBusBase.java | 408 +
.../framework/messagebus/MessageBusEndpoint.java | 61 +
.../framework/messagebus/MessageDispatcher.java | 104 +
.../framework/messagebus/MessageHandler.java | 30 +
.../framework/messagebus/MessageSubscriber.java | 24 +
.../framework/messagebus/PublishScope.java | 24 +
.../framework/server/ServerEventBus.java | 4 +-
.../sampleserver/SampleManagerComponent.java | 12 +-
.../sampleserver/SampleManagerComponent2.java | 12 +-
.../cloudstack/messagebus/TestMessageBus.java | 116 +
.../ipc/test/resources/MessageBusTestContext.xml | 51 +
packaging/centos63/package.sh | 5 +-
packaging/debian/init/cloud-management | 2 +-
packaging/debian/replace.properties | 2 +-
.../debian/config/etc/init.d/cloud-early-config | 61 +-
patches/systemvm/debian/config/root/edithosts.sh | 3 +-
.../manager/allocator/impl/RandomAllocator.java | 56 +
.../hypervisor/kvm/resource/KVMHAMonitor.java | 7 +-
.../kvm/resource/LibvirtComputingResource.java | 25 +-
.../hypervisor/kvm/resource/LibvirtConnection.java | 14 +-
.../kvm/storage/KVMStoragePoolManager.java | 12 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 9 +
.../vmware/manager/VmwareManagerImpl.java | 3 +-
.../hypervisor/vmware/resource/VmwareResource.java | 44 +-
.../hypervisor/xen/resource/CitrixHelper.java | 3 +-
.../xen/resource/CitrixResourceBase.java | 4 +-
.../xen/resource/XenServer56FP1Resource.java | 1 +
.../xen/resource/XenServer610Resource.java | 359 +-
.../motion/XenServerStorageMotionStrategy.java | 239 +
.../cloud/network/resource/NetscalerResource.java | 64 +-
.../cloud/network/element/NiciraNvpElement.java | 5 +
.../network/element/NiciraNvpElementTest.java | 238 +-
plugins/pom.xml | 3 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 3 +-
pom.xml | 131 +-
scripts/vm/network/security_group.py | 2 +-
server/pom.xml | 2 +-
.../agent/manager/allocator/HostAllocator.java | 23 +-
.../manager/allocator/impl/FirstFitAllocator.java | 47 +
.../manager/allocator/impl/TestingAllocator.java | 7 +
server/src/com/cloud/alert/AlertManagerImpl.java | 30 +-
server/src/com/cloud/api/ApiDBUtils.java | 30 +-
server/src/com/cloud/api/ApiDispatcher.java | 9 -
server/src/com/cloud/api/ApiResponseHelper.java | 91 +-
server/src/com/cloud/api/ApiServer.java | 168 +-
server/src/com/cloud/api/ApiServerService.java | 1 +
server/src/com/cloud/api/ApiServlet.java | 6 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 74 +-
.../com/cloud/api/query/ViewResponseHelper.java | 37 +
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 14 +-
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 1 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 7 +-
.../src/com/cloud/api/query/dao/HostJoinDao.java | 5 +
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 142 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +-
.../cloud/api/query/dao/StoragePoolJoinDao.java | 6 +
.../api/query/dao/StoragePoolJoinDaoImpl.java | 66 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 7 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 7 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 9 +-
.../src/com/cloud/api/query/vo/AccountJoinVO.java | 16 +-
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 11 +
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 18 +-
server/src/com/cloud/api/query/vo/HostJoinVO.java | 17 +-
.../cloud/api/query/vo/SecurityGroupJoinVO.java | 6 +-
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 17 +-
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 22 +-
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 19 +-
.../src/com/cloud/api/query/vo/VolumeJoinVO.java | 21 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 2 +-
.../cloud/capacity/StorageCapacityListener.java | 16 +-
server/src/com/cloud/capacity/dao/CapacityDao.java | 2 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 35 +-
server/src/com/cloud/configuration/Config.java | 100 +-
.../cloud/configuration/ConfigurationManager.java | 5 +-
.../configuration/ConfigurationManagerImpl.java | 244 +-
.../cloud/configuration/dao/ConfigurationDao.java | 1 +
server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 8 +
server/src/com/cloud/dc/dao/DataCenterDao.java | 2 +
server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 8 +
server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 6 +
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 50 +-
server/src/com/cloud/dc/dao/VlanDao.java | 2 +
server/src/com/cloud/dc/dao/VlanDaoImpl.java | 19 +
server/src/com/cloud/deploy/FirstFitPlanner.java | 65 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 5 +
.../network/ExternalFirewallDeviceManagerImpl.java | 14 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 4 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 53 +-
server/src/com/cloud/network/NetworkModelImpl.java | 11 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 336 +-
server/src/com/cloud/network/addr/PublicIp.java | 18 +-
server/src/com/cloud/network/dao/IPAddressVO.java | 2 -
.../com/cloud/network/dao/PhysicalNetworkVO.java | 20 +-
.../network/element/VirtualRouterElement.java | 2 +-
.../network/firewall/FirewallManagerImpl.java | 12 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 14 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 26 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 33 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 6 +-
.../src/com/cloud/server/ConfigurationServer.java | 5 +
.../com/cloud/server/ConfigurationServerImpl.java | 110 +-
server/src/com/cloud/server/Criteria.java | 12 +-
.../src/com/cloud/server/ManagementServerImpl.java | 464 +-
.../src/com/cloud/service/ServiceOfferingVO.java | 23 -
server/src/com/cloud/storage/StorageManager.java | 2 +
.../src/com/cloud/storage/StorageManagerImpl.java | 62 +-
server/src/com/cloud/storage/VolumeManager.java | 8 +
.../src/com/cloud/storage/VolumeManagerImpl.java | 112 +-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 10 +
.../src/com/cloud/storage/dao/VMTemplateDao.java | 4 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 17 +-
.../storage/snapshot/SnapshotManagerImpl.java | 32 +-
.../com/cloud/template/TemplateAdapterBase.java | 7 +-
.../com/cloud/template/TemplateManagerImpl.java | 27 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 75 +-
.../com/cloud/usage/UsageNetworkOfferingVO.java | 14 +-
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 9 +-
server/src/com/cloud/user/AccountManagerImpl.java | 15 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 273 +-
server/src/com/cloud/vm/UserVmStateListener.java | 21 +-
server/src/com/cloud/vm/VirtualMachineManager.java | 4 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 277 +-
.../affinity/AffinityGroupServiceImpl.java | 2 +-
.../cloudstack/affinity/AffinityGroupVO.java | 2 +-
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 25 +
.../configuration/ConfigurationManagerTest.java | 4 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 4 +-
.../com/cloud/network/MockNetworkModelImpl.java | 2 +-
.../cloud/network/UpdatePhysicalNetworkTest.java | 68 +
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 58 +-
.../cloud/vm/MockVirtualMachineManagerImpl.java | 10 +
server/test/com/cloud/vm/UserVmManagerTest.java | 47 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 231 +-
.../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 43 +-
.../cloud/vm/dao/UserVmDaoTestConfiguration.java | 50 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 11 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +-
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 2 +-
server/test/com/cloud/vpc/Site2SiteVpnTest.java | 2 +-
server/test/com/cloud/vpc/VpcApiUnitTest.java | 167 +-
.../test/com/cloud/vpc/VpcTestConfiguration.java | 73 +-
.../affinity/AffinityApiTestConfiguration.java | 29 +-
.../networkoffering/ChildTestConfiguration.java | 38 +-
server/test/resources/UserVMDaoTestContext.xml | 44 +
.../resource/NfsSecondaryStorageResource.java | 22 +
setup/db/db/schema-40to410.sql | 4 +-
setup/db/db/schema-410to420.sql | 718 +-
setup/db/templates.sql | 12 +
test/integration/component/test_accounts.py | 10 +-
.../component/test_allocation_states.py | 2 +-
test/integration/component/test_blocker_bugs.py | 8 +-
test/integration/component/test_egress_rules.py | 13 +-
test/integration/component/test_eip_elb.py | 3 +-
.../component/test_multiple_ip_ranges.py | 238 +
.../integration/component/test_network_offering.py | 5 +-
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 4 +-
.../component/test_project_resources.py | 7 +-
test/integration/component/test_project_usage.py | 10 +-
test/integration/component/test_projects.py | 8 +-
test/integration/component/test_resource_limits.py | 4 +-
test/integration/component/test_routers.py | 5 +-
test/integration/component/test_security_groups.py | 9 +-
test/integration/component/test_snapshots.py | 8 +-
test/integration/component/test_storage_motion.py | 298 +
test/integration/component/test_templates.py | 3 +-
test/integration/component/test_usage.py | 10 +-
.../integration/component/test_vm_passwdenabled.py | 1 +
test/integration/component/test_volumes.py | 6 +-
test/integration/component/test_vpn_users.py | 447 +
test/integration/smoke/test_ScaleVm.py | 221 -
test/integration/smoke/test_affinity_groups.py | 10 +-
.../smoke/test_deploy_vm_with_userdata.py | 144 +
test/integration/smoke/test_global_settings.py | 72 +
test/integration/smoke/test_iso.py | 2 +-
test/integration/smoke/test_network.py | 2 +-
test/integration/smoke/test_non_contigiousvlan.py | 86 +
test/integration/smoke/test_public_ip_range.py | 8 +-
test/integration/smoke/test_routers.py | 2 +-
test/integration/smoke/test_scale_vm.py | 221 +
test/integration/smoke/test_templates.py | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 28 +-
test/integration/smoke/test_volumes.py | 2 +-
tools/apidoc/gen_toc.py | 1 +
.../definitions/systemvmtemplate/cleanup.sh | 1 -
.../definitions/systemvmtemplate64/cleanup.sh | 1 -
tools/build/build_asf.sh | 81 +-
tools/build/setnextversion.sh | 75 +
tools/marvin/marvin/asyncJobMgr.py | 72 +-
tools/marvin/marvin/cloudstackConnection.py | 277 +-
tools/marvin/marvin/cloudstackTestClient.py | 56 +-
tools/marvin/marvin/codegenerator.py | 4 +-
tools/marvin/marvin/dbConnection.py | 6 +-
tools/marvin/marvin/deployDataCenter.py | 8 +-
tools/marvin/marvin/integration/lib/base.py | 631 +-
tools/marvin/marvin/integration/lib/common.py | 4 +-
tools/marvin/marvin/integration/lib/utils.py | 17 +-
tools/marvin/marvin/jsonHelper.py | 7 +-
tools/marvin/marvin/remoteSSHClient.py | 18 +-
tools/marvin/setup.py | 1 +
tools/transifex/.tx/config | 32 +
tools/transifex/README-transifex.txt | 71 +
tools/transifex/sync-transifex-ui.sh | 160 +
ui/css/cloudstack3.css | 235 +-
ui/dictionary.jsp | 1714 ++--
ui/images/icons.png | Bin 50745 -> 50052 bytes
ui/images/sprites.png | Bin 188552 -> 192407 bytes
ui/index.jsp | 36 +-
ui/modules/modules.js | 20 +
ui/scripts/accounts.js | 7 +
ui/scripts/affinity.js | 183 +
ui/scripts/cloudStack.js | 9 +-
ui/scripts/domains.js | 2 +-
ui/scripts/events.js | 8 +-
ui/scripts/instanceWizard.js | 932 +-
ui/scripts/instances.js | 399 +-
ui/scripts/network.js | 51 +-
ui/scripts/plugins.js | 95 +-
ui/scripts/regions.js | 322 +-
ui/scripts/sharedFunctions.js | 4 +
ui/scripts/storage.js | 97 +-
ui/scripts/system.js | 544 +-
ui/scripts/templates.js | 80 +-
ui/scripts/ui-custom/affinity.js | 173 +
ui/scripts/ui-custom/instanceWizard.js | 42 +-
ui/scripts/ui-custom/pluginListing.js | 109 +
ui/scripts/ui-custom/plugins.js | 109 -
ui/scripts/ui-custom/projectSelect.js | 66 +
ui/scripts/ui-custom/projects.js | 6 +-
ui/scripts/ui-custom/zoneFilter.js | 39 +
ui/scripts/ui/widgets/detailView.js | 157 +-
ui/scripts/ui/widgets/listView.js | 10 +-
ui/scripts/vpc.js | 6 +
ui/scripts/zoneWizard.js | 55 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 10 +-
.../vmware/util/VmwareGuestOsMapper.java | 16 +-
402 files changed, 34719 insertions(+), 18888 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1de600c/ui/index.jsp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1de600c/ui/scripts/accounts.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1de600c/ui/scripts/system.js
----------------------------------------------------------------------