cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [2/6] git commit: refs/heads/bvt - Merge branch 'master' into bvt
Date Sun, 10 Mar 2013 15:38:59 GMT
Merge branch 'master' into bvt


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

Branch: refs/heads/bvt
Commit: d521e66aa274f47d217d979aae9ddb7675c44680
Parents: cd4ee01 ebafcf8
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sun Mar 10 11:31:05 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sun Mar 10 11:31:05 2013 +0530

----------------------------------------------------------------------
 agent/src/com/cloud/agent/AgentShell.java          |    5 +-
 .../consoleproxy/ConsoleProxyResource.java         |   25 +-
 .../cloud/agent/api/routing/DhcpEntryCommand.java  |   10 +
 api/src/com/cloud/alert/Alert.java                 |    1 +
 api/src/com/cloud/event/Event.java                 |    1 +
 .../cloud/exception/PermissionDeniedException.java |    4 +
 .../com/cloud/exception/RequestLimitException.java |    3 +-
 api/src/com/cloud/network/Network.java             |    1 -
 api/src/com/cloud/server/ManagementService.java    |   38 +-
 api/src/org/apache/cloudstack/acl/APIChecker.java  |    3 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    1 +
 .../command/admin/account/CreateAccountCmd.java    |    4 +-
 .../command/admin/account/DeleteAccountCmd.java    |    4 +-
 .../command/admin/account/DisableAccountCmd.java   |    2 +-
 .../command/admin/account/EnableAccountCmd.java    |    3 +-
 .../command/admin/account/UpdateAccountCmd.java    |    3 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |    2 +-
 .../api/command/admin/domain/UpdateDomainCmd.java  |    4 +-
 .../command/admin/resource/ArchiveAlertsCmd.java   |  100 +
 .../command/admin/resource/DeleteAlertsCmd.java    |   99 +
 .../api/command/admin/user/DeleteUserCmd.java      |    2 +-
 .../api/command/admin/user/DisableUserCmd.java     |    4 +-
 .../api/command/admin/user/EnableUserCmd.java      |    4 +-
 .../api/command/admin/user/UpdateUserCmd.java      |    4 +-
 .../command/user/config/ListCapabilitiesCmd.java   |    8 +-
 .../api/command/user/event/ArchiveEventsCmd.java   |  105 +
 .../api/command/user/event/DeleteEventsCmd.java    |  105 +
 .../apache/cloudstack/region/RegionService.java    |  136 +-
 .../classes/resources/messages_fr_FR.properties    | 2446 +++++++--------
 client/tomcatconf/applicationContext.xml.in        |    7 +-
 client/tomcatconf/commands.properties.in           |    4 +
 client/tomcatconf/componentContext.xml.in          |    2 +-
 .../virtualnetwork/VirtualRoutingResource.java     |   52 +-
 core/src/com/cloud/alert/AlertVO.java              |   38 +-
 core/src/com/cloud/event/EventVO.java              |  167 +-
 core/src/com/cloud/event/dao/EventDao.java         |    5 +
 core/src/com/cloud/event/dao/EventDaoImpl.java     |   71 +-
 .../src/com/cloud/storage/StoragePoolDetailVO.java |   81 -
 core/src/com/cloud/user/AccountVO.java             |   40 +-
 core/src/com/cloud/user/UserVO.java                |   23 +-
 debian/cloudstack-agent.install                    |    1 +
 debian/cloudstack-agent.postinst                   |   40 +
 debian/cloudstack-management.install               |    4 +-
 debian/cloudstack-management.postinst              |    6 +-
 debian/control                                     |    2 +-
 debian/rules                                       |  136 +-
 docs/en-US/Developers_Guide.xml                    |    2 +-
 docs/en-US/add-remove-nic.xml                      |  127 +
 docs/en-US/added-API-commands-4-1.xml              |   28 +
 docs/en-US/advanced-zone-guest-ip-addresses.xml    |   12 +-
 docs/en-US/build-deb.xml                           |    2 +-
 docs/en-US/build-rpm.xml                           |  146 +-
 docs/en-US/building-marvin.xml                     |    4 +-
 docs/en-US/cloudmonkey.xml                         |  224 ++
 docs/en-US/devcloud-usage-mode.xml                 |    4 +-
 docs/en-US/getting-release.xml                     |   40 +-
 docs/en-US/globally-configured-limits.xml          |    2 +-
 docs/en-US/guest-traffic.xml                       |    9 +-
 docs/en-US/networks.xml                            |    1 +
 docs/en-US/reserved-ip-addresses-non-csvms.xml     |  163 +
 docs/en-US/source-prereqs.xml                      |   13 +-
 docs/en-US/source.xml                              |   18 +-
 docs/en-US/tools.xml                               |    1 +
 docs/en-US/verifying-source.xml                    |    2 +-
 docs/en-US/whats-new.xml                           |    1 +
 docs/en-US/working-with-snapshots.xml              |    4 +
 docs/en-US/working-with-usage-data.xml             |    1 +
 docs/pot/build-deb.pot                             |    2 +-
 .../storage/datastore/db/PrimaryDataStoreDao.java  |  148 +-
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |  544 ++--
 .../storage/datastore/db/StoragePoolDetailVO.java  |   81 +
 .../datastore/db/StoragePoolDetailsDao.java        |   28 +
 .../storage/datastore/db/StoragePoolVO.java        |    9 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |    4 +-
 .../cloud/entity/api/db/dao/VMEntityDaoImpl.java   |    8 +-
 .../entity/api/db/dao/VMReservationDaoImpl.java    |    2 +-
 .../platform/orchestration/CloudOrchestrator.java  |   21 +-
 .../image/store/DefaultImageDataStoreImpl.java     |    2 +-
 .../storage/image/store/TemplateObject.java        |    2 +-
 .../storage/allocator/StorageAllocatorTest.java    |    8 +-
 .../StorageAllocatorTestConfiguration.java         |    4 +-
 .../storage/test/DirectAgentManagerSimpleImpl.java |    6 +
 .../storage/snapshot/SnapshotObject.java           |    2 +-
 .../snapshot/strategy/AncientSnasphotStrategy.java |    4 +-
 .../allocator/AbstractStoragePoolAllocator.java    |    4 +-
 .../allocator/ZoneWideStoragePoolAllocator.java    |    4 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java       |    2 +
 .../storage/volume/db/VolumeDao2Impl.java          |    5 +-
 .../storage/datastore/DefaultPrimaryDataStore.java |    2 +-
 .../AncientPrimaryDataStoreLifeCycleImpl.java      |    2 +-
 .../storage/volume/VolumeEntityImpl.java           |    2 +-
 .../cloudstack/storage/volume/VolumeObject.java    |    2 +-
 packaging/centos63/cloud-agent.rc                  |   98 +-
 packaging/centos63/cloud.spec                      |   12 +-
 packaging/debian/init/cloud-agent                  |    8 +-
 .../debian/config/etc/init.d/cloud-early-config    |   23 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh     |   12 +
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh     |   12 +
 patches/systemvm/debian/config/root/edithosts.sh   |   16 +-
 patches/systemvm/debian/config/root/func.sh        |    7 +-
 .../config/root/redundant_router/backup.sh.templ   |    1 +
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |    9 +
 .../api/command/user/ratelimit/GetApiLimitCmd.java |   11 +
 .../cloudstack/ratelimit/ApiRateLimitService.java  |    2 +
 .../ratelimit/ApiRateLimitServiceImpl.java         |   21 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java     |   25 +
 plugins/hypervisors/kvm/pom.xml                    |    6 -
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |    6 +-
 .../kvm/resource/LibvirtComputingResource.java     |  255 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   25 +
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |    8 +-
 .../hypervisor/vmware/resource/VmwareResource.java |    6 +-
 .../xen/resource/CitrixResourceBase.java           |    4 +
 pom.xml                                            |    5 +-
 scripts/network/domr/dhcp_entry.sh                 |    6 +-
 scripts/vm/hypervisor/kvm/patchviasocket.pl        |   58 +
 scripts/vm/hypervisor/kvm/rundomrpre.sh            |  147 -
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh    |   33 +-
 server/src/com/cloud/agent/AgentManager.java       |    2 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   10 +-
 .../src/com/cloud/agent/manager/AgentMonitor.java  |    9 +-
 .../cloud/agent/manager/AgentMonitorService.java   |   28 +
 .../allocator/impl/RecreateHostAllocator.java      |    4 +-
 server/src/com/cloud/alert/dao/AlertDao.java       |    7 +
 server/src/com/cloud/alert/dao/AlertDaoImpl.java   |   85 +
 server/src/com/cloud/api/ApiDBUtils.java           |    5 +-
 server/src/com/cloud/api/ApiDispatcher.java        |   14 +-
 server/src/com/cloud/api/ApiServer.java            |   54 +-
 server/src/com/cloud/api/ApiServerService.java     |   37 +
 server/src/com/cloud/api/ApiServlet.java           |    2 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   17 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |   23 +
 server/src/com/cloud/api/query/vo/EventJoinVO.java |    9 +
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |    4 +-
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |    5 +-
 server/src/com/cloud/configuration/Config.java     |    8 +-
 .../configuration/ConfigurationManagerImpl.java    |    5 +-
 .../configuration/dao/ConfigurationDaoImpl.java    |    9 -
 .../configuration/dao/ResourceCountDaoImpl.java    |    9 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    4 +-
 server/src/com/cloud/dc/dao/DataCenterDaoImpl.java |   10 +-
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |    6 +
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java    |   32 +
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |    2 +-
 server/src/com/cloud/dc/dao/DataCenterVnetDao.java |   38 +
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |    2 +-
 server/src/com/cloud/dc/dao/PodVlanDao.java        |   30 +
 server/src/com/cloud/dc/dao/PodVlanDaoImpl.java    |    2 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |    4 +-
 server/src/com/cloud/ha/RecreatableFencer.java     |    8 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   12 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   17 +-
 server/src/com/cloud/network/NetworkModelImpl.java |    7 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   32 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |    5 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |    6 +-
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |    2 +-
 .../com/cloud/network/dao/NetworkAccountDao.java   |   22 +
 .../cloud/network/dao/NetworkAccountDaoImpl.java   |    2 +-
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |   20 +-
 server/src/com/cloud/network/dao/NetworkOpDao.java |   26 +
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |    2 +-
 .../cloud/network/dao/PhysicalNetworkDaoImpl.java  |    2 +-
 .../com/cloud/network/dao/RouterNetworkDao.java    |   26 +
 .../cloud/network/dao/RouterNetworkDaoImpl.java    |    2 +-
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |    4 +-
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |    2 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    3 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java      |    5 +-
 .../network/security/dao/SecurityGroupDaoImpl.java |    3 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    1 -
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |    3 +-
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |    7 +-
 .../src/com/cloud/projects/ProjectManagerImpl.java |    3 +-
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |    3 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    4 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |    2 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   53 +-
 .../src/com/cloud/server/ManagementServerImpl.java |  120 +-
 .../src/com/cloud/servlet/CloudStartupServlet.java |   17 +-
 .../cloud/storage/LocalStoragePoolListener.java    |    4 +-
 server/src/com/cloud/storage/OCFS2ManagerImpl.java |    4 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    2 +-
 .../src/com/cloud/storage/VolumeManagerImpl.java   |    4 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   12 +-
 .../src/com/cloud/storage/dao/StoragePoolDao.java  |  113 -
 .../com/cloud/storage/dao/StoragePoolDaoImpl.java  |  432 ---
 .../cloud/storage/dao/StoragePoolDetailsDao.java   |   28 -
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    3 +-
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |    4 +-
 .../cloud/storage/listener/StoragePoolMonitor.java |    4 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |    4 +-
 .../com/cloud/template/TemplateManagerImpl.java    |    4 +-
 server/src/com/cloud/user/AccountManager.java      |   14 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   71 +-
 server/src/com/cloud/user/DomainManagerImpl.java   |   15 +-
 server/src/com/cloud/user/dao/AccountDaoImpl.java  |   90 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    4 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    5 +-
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |   12 +-
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |    3 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |    4 +-
 .../apache/cloudstack/region/RegionManager.java    |   94 +
 .../cloudstack/region/RegionManagerImpl.java       |  432 +++-
 .../cloudstack/region/RegionServiceImpl.java       |   72 +-
 .../apache/cloudstack/region/RegionsApiUtil.java   |  306 ++
 .../cloudstack/region/dao/RegionSyncDao.java       |   24 -
 .../cloudstack/region/dao/RegionSyncDaoImpl.java   |   35 -
 .../test/com/cloud/agent/MockAgentManagerImpl.java |    6 +
 .../com/cloud/alert/AlertControlsUnitTest.java     |   83 +
 .../com/cloud/event/EventControlsUnitTest.java     |   84 +
 .../com/cloud/storage/dao/StoragePoolDaoTest.java  |    3 +-
 .../dao/StoragePoolDaoTestConfiguration.java       |    3 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |    3 +-
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |    4 +-
 .../cloudstack/region/RegionManagerTest.java       |   35 +-
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |   29 +-
 .../ConsoleProxyHttpHandlerHelper.java             |    7 +-
 setup/db/db/schema-40to410.sql                     |    4 +
 setup/db/db/schema-410to420.sql                    |   45 +
 test/integration/component/test_accounts.py        |    5 +-
 .../component/test_allocation_states.py            |    5 +-
 test/integration/component/test_blocker_bugs.py    |   14 +-
 test/integration/component/test_egress_rules.py    |   24 +-
 test/integration/component/test_eip_elb.py         |    6 +-
 .../integration/component/test_network_offering.py |   10 +-
 test/integration/component/test_project_configs.py |    4 +-
 test/integration/component/test_project_limits.py  |    8 +-
 .../component/test_project_resources.py            |   16 +-
 test/integration/component/test_project_usage.py   |   22 +-
 test/integration/component/test_projects.py        |    4 +-
 test/integration/component/test_resource_limits.py |   10 +-
 test/integration/component/test_routers.py         |   10 +-
 test/integration/component/test_security_groups.py |   16 +-
 test/integration/component/test_templates.py       |    8 +-
 test/integration/component/test_usage.py           |   22 +-
 test/integration/component/test_volumes.py         |   14 +-
 tools/appliance/build.sh                           |    2 +-
 .../appliance/definitions/systemvmtemplate/base.sh |    2 +-
 .../definitions/systemvmtemplate/definition.rb     |    6 +-
 .../definitions/systemvmtemplate/postinstall.sh    |    2 +
 .../definitions/systemvmtemplate/zerodisk.sh       |    1 +
 tools/cli/cloudmonkey/cloudmonkey.py               |    9 +-
 tools/cli/cloudmonkey/config.py                    |    1 +
 ui/scripts/docs.js                                 |    9 +
 ui/scripts/globalSettings.js                       |    2 +-
 ui/scripts/installWizard.js                        |    4 +-
 ui/scripts/system.js                               |   13 +-
 ui/scripts/ui-custom/installWizard.js              |    4 +-
 .../src/com/cloud/utils/component/AdapterBase.java |    2 +-
 .../cloud/utils/component/ComponentContext.java    |   66 +-
 utils/src/com/cloud/utils/db/GenericDao.java       |    2 +
 utils/src/com/cloud/utils/db/GenericDaoBase.java   |   46 +-
 utils/src/com/cloud/utils/db/QueryBuilder.java     |   20 +-
 .../cloud/utils/db/TransactionContextBuilder.java  |   30 +-
 .../utils/log/CglibThrowableRendererTest.java      |    6 +-
 .../cloud/hypervisor/vmware/util/VmwareClient.java |   22 +
 .../hypervisor/vmware/util/VmwareContext.java      |   16 +-
 258 files changed, 5972 insertions(+), 3817 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d521e66a/pom.xml
----------------------------------------------------------------------


Mime
View raw message