cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [7/50] git commit: refs/heads/Health-Check-UI - Merge branch 'master' into ui-multiple-nics
Date Fri, 15 Mar 2013 18:46:45 GMT
Merge branch 'master' into ui-multiple-nics


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

Branch: refs/heads/Health-Check-UI
Commit: 2f03e55bbbe3d8622d7f9758f748de5139ac3a0e
Parents: fb8f33d a452155
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Mar 6 09:59:36 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Mar 6 09:59:36 2013 -0800

----------------------------------------------------------------------
 agent/src/com/cloud/agent/AgentShell.java          |    5 +-
 .../consoleproxy/ConsoleProxyResource.java         |   25 +-
 .../classes/resources/messages_fr_FR.properties    | 2446 +++++++--------
 client/tomcatconf/applicationContext.xml.in        |    7 +-
 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/cloudmonkey.xml                         |  224 ++
 docs/en-US/devcloud-usage-mode.xml                 |    4 +-
 docs/en-US/tools.xml                               |    1 +
 docs/en-US/whats-new.xml                           |    1 +
 .../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/test/DirectAgentManagerSimpleImpl.java |    6 +
 .../storage/snapshot/SnapshotObject.java           |    2 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java       |    2 +
 .../storage/volume/db/VolumeDao2Impl.java          |    5 +-
 .../storage/datastore/DefaultPrimaryDataStore.java |    2 +-
 .../storage/volume/VolumeEntityImpl.java           |    2 +-
 .../cloudstack/storage/volume/VolumeObject.java    |    2 +-
 packaging/centos63/cloud.spec                      |    1 -
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh     |   12 +
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh     |   12 +
 patches/systemvm/debian/config/root/func.sh        |    7 +-
 .../config/root/redundant_router/backup.sh.templ   |    1 +
 .../kvm/resource/LibvirtComputingResource.java     |    6 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   25 +
 server/src/com/cloud/agent/AgentManager.java       |    2 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |    6 +-
 .../src/com/cloud/agent/manager/AgentMonitor.java  |    9 +-
 .../cloud/agent/manager/AgentMonitorService.java   |   28 +
 server/src/com/cloud/api/ApiDispatcher.java        |    8 +-
 server/src/com/cloud/api/ApiServer.java            |   34 +-
 server/src/com/cloud/api/ApiServerService.java     |   37 +
 server/src/com/cloud/api/ApiServlet.java           |    2 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   10 +-
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |    5 +-
 .../configuration/ConfigurationManagerImpl.java    |    3 +-
 .../configuration/dao/ConfigurationDaoImpl.java    |    9 -
 .../configuration/dao/ResourceCountDaoImpl.java    |    9 +-
 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/ha/RecreatableFencer.java     |    4 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |    3 +-
 .../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 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java      |    5 +-
 .../network/security/dao/SecurityGroupDaoImpl.java |    3 +-
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |    3 +-
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |    7 +-
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |    3 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   20 +
 .../src/com/cloud/servlet/CloudStartupServlet.java |   17 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   12 +-
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |    4 +-
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |   12 +-
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |    3 +-
 .../test/com/cloud/agent/MockAgentManagerImpl.java |    6 +
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |   29 +-
 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 +-
 .../appliance/definitions/systemvmtemplate/base.sh |    2 +-
 .../definitions/systemvmtemplate/postinstall.sh    |    2 +
 tools/cli/cloudmonkey/cloudmonkey.py               |    9 +-
 tools/cli/cloudmonkey/config.py                    |    1 +
 ui/scripts/installWizard.js                        |    4 +-
 ui/scripts/ui-custom/installWizard.js              |    4 +-
 .../src/com/cloud/utils/component/AdapterBase.java |    2 +-
 .../cloud/utils/component/ComponentContext.java    |   62 +-
 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  |   12 +-
 .../utils/log/CglibThrowableRendererTest.java      |    6 +-
 .../cloud/hypervisor/vmware/util/VmwareClient.java |   31 +
 .../hypervisor/vmware/util/VmwareContext.java      |   16 +-
 114 files changed, 2375 insertions(+), 1624 deletions(-)
----------------------------------------------------------------------



Mime
View raw message