cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [41/42] git commit: refs/heads/marvin-refactor - Merge branch 'master' into marvin-refactor-phase1
Date Fri, 01 Mar 2013 10:06:29 GMT
Merge branch 'master' into marvin-refactor-phase1


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

Branch: refs/heads/marvin-refactor
Commit: e459f1215f7ef95c92a4e3454f003b2bad229430
Parents: 504cb4d bf1b40e
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Fri Feb 8 10:13:19 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Feb 8 10:13:19 2013 +0530

----------------------------------------------------------------------
 agent/test/com/cloud/agent/TestAgentShell.java     |    2 +-
 api/src/com/cloud/dao/EntityManager.java           |   10 +
 api/src/com/cloud/network/NetworkModel.java        |    4 +-
 api/src/com/cloud/network/NetworkUsageService.java |   37 +
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    4 +
 .../apache/cloudstack/api/ResponseGenerator.java   |    7 +
 .../command/admin/usage/AddTrafficMonitorCmd.java  |  107 +
 .../admin/usage/DeleteTrafficMonitorCmd.java       |   84 +
 .../admin/usage/GenerateUsageRecordsCmd.java       |   89 +
 .../command/admin/usage/GetUsageRecordsCmd.java    |  126 ++
 .../admin/usage/ListTrafficMonitorsCmd.java        |   84 +
 .../api/command/admin/usage/ListUsageTypesCmd.java |   51 +
 .../user/firewall/CreateFirewallRuleCmd.java       |    2 +-
 .../cloudstack/api/response/AccountResponse.java   |    6 +-
 api/src/org/apache/cloudstack/usage/Usage.java     |   69 +
 .../org/apache/cloudstack/usage/UsageService.java  |   64 +
 .../org/apache/cloudstack/usage/UsageTypes.java    |   58 +
 .../WEB-INF/classes/resources/messages.properties  |    7 +
 .../classes/resources/messages_fr_FR.properties    |    7 +
 .../classes/resources/messages_ja.properties       |    9 +-
 .../classes/resources/messages_ko_KR.properties    | 1514 +++++++++++++++
 .../classes/resources/messages_pt_BR.properties    |    7 +
 .../classes/resources/messages_ru_RU.properties    |    9 +
 .../classes/resources/messages_zh_CN.properties    |    7 +
 client/bindir/cloud-setup-management.in            |    2 +-
 client/pom.xml                                     |    2 +-
 client/tomcatconf/componentContext.xml.in          |    6 +-
 client/tomcatconf/nonossComponentContext.xml.in    |   12 +-
 core/src/com/cloud/storage/SnapshotVO.java         |   12 +-
 deps/install-non-oss.sh                            |   12 +-
 docs/en-US/add-load-balancer-rule.xml              |   30 +-
 .../change-network-offering-on-guest-network.xml   |    4 +-
 docs/en-US/console-proxy.xml                       |  160 ++-
 docs/en-US/creating-network-offerings.xml          |    4 +-
 docs/en-US/host-add.xml                            |    3 +-
 docs/en-US/hypervisor-host-install-libvirt.xml     |   10 +-
 docs/en-US/load-balancer-rules.xml                 |   22 +-
 docs/en-US/network-offerings.xml                   |    2 +-
 docs/en-US/prepare-system-vm-template.xml          |   29 +-
 .../en-US/sticky-session-policies-for-lb-rules.xml |   21 +-
 ...pgrade-virtual-router-with-service-offering.xml |    5 +-
 packaging/centos63/cloud-management.rc             |    8 +-
 packaging/centos63/cloud-management.sysconfig      |    2 +-
 packaging/centos63/cloud.spec                      |   23 +-
 packaging/centos63/replace.properties              |    8 +-
 .../discovery/ApiDiscoveryServiceImpl.java         |   16 +-
 .../cloudstack/discovery/ApiDiscoveryTest.java     |   18 +-
 .../kvm/resource/LibvirtComputingResource.java     |   47 +-
 .../server/ManagementServerSimulatorImpl.java      |    2 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |    7 +-
 .../vmware/resource/VmwareContextFactory.java      |   29 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   52 +
 .../dns-notifier/resources/components-example.xml  |    2 +-
 .../server/auth/PlainTextUserAuthenticator.java    |    3 -
 scripts/storage/qcow2/resizevolume.sh              |    2 +-
 scripts/vm/hypervisor/xenserver/vmops              |    1 +
 server/src/com/cloud/api/ApiDBUtils.java           |   14 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |  253 +++
 server/src/com/cloud/api/ApiServer.java            |   26 +-
 server/src/com/cloud/api/ApiServlet.java           |    2 +-
 .../cloud/api/commands/AddTrafficMonitorCmd.java   |  109 -
 .../api/commands/DeleteTrafficMonitorCmd.java      |   86 -
 .../api/commands/GenerateUsageRecordsCmd.java      |   91 -
 .../com/cloud/api/commands/GetUsageRecordsCmd.java |  370 ----
 .../cloud/api/commands/ListTrafficMonitorsCmd.java |   86 -
 .../com/cloud/api/commands/ListUsageTypesCmd.java  |   53 -
 server/src/com/cloud/configuration/Config.java     |    3 +-
 server/src/com/cloud/dao/EntityManagerImpl.java    |    7 +-
 .../com/cloud/network/Ipv6AddressManagerImpl.java  |   77 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |    6 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   38 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   12 +-
 .../src/com/cloud/network/NetworkUsageManager.java |   14 -
 .../com/cloud/network/NetworkUsageManagerImpl.java |   20 +-
 .../com/cloud/network/dao/UserIpv6AddressDao.java  |    2 +
 .../cloud/network/dao/UserIpv6AddressDaoImpl.java  |    8 +
 .../com/cloud/resource/ResourceManagerImpl.java    |   72 +-
 .../src/com/cloud/server/ManagementServerExt.java  |   63 -
 .../com/cloud/server/ManagementServerExtImpl.java  |  254 ---
 .../src/com/cloud/server/ManagementServerImpl.java |    3 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    7 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |    2 +-
 server/src/com/cloud/upgrade/DatabaseCreator.java  |    5 +-
 server/src/com/cloud/usage/UsageServiceImpl.java   |  261 +++
 server/src/com/cloud/usage/UsageTypes.java         |   58 -
 server/src/com/cloud/usage/UsageVO.java            |   23 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    4 +-
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |    4 +-
 .../cloudstack/region/RegionManagerImpl.java       |    2 +
 .../cloudstack/region/RegionServiceImpl.java       |    2 +
 .../com/cloud/network/MockNetworkModelImpl.java    |    9 +-
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |   10 +-
 tools/appliance/.rvmrc                             |   24 +
 tools/appliance/Gemfile                            |   20 +
 tools/appliance/README.md                          |   52 +
 .../appliance/definitions/systemvmtemplate/base.sh |   42 +
 .../definitions/systemvmtemplate/cleanup.sh        |   34 +
 .../definitions/systemvmtemplate/definition.rb     |   60 +
 .../definitions/systemvmtemplate/preseed.cfg       |  332 ++++
 .../definitions/systemvmtemplate/zerodisk.sh       |   20 +
 tools/cli/cloudmonkey/cloudmonkey.py               |    4 +-
 tools/git/prepare-commit-msg                       |   23 +-
 ui/css/cloudstack3.css                             |    2 +
 ui/dictionary.jsp                                  |    7 +-
 ui/index.jsp                                       |    1 +
 ui/scripts/storage.js                              |   99 +
 ui/scripts/ui-custom/dashboard.js                  |    8 +-
 ui/scripts/ui/utils.js                             |    6 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java    |    1 +
 .../cloud/usage/parser/IPAddressUsageParser.java   |    2 +-
 .../usage/parser/LoadBalancerUsageParser.java      |    2 +-
 .../usage/parser/NetworkOfferingUsageParser.java   |    2 +-
 .../com/cloud/usage/parser/NetworkUsageParser.java |    2 +-
 .../usage/parser/PortForwardingUsageParser.java    |    2 +-
 .../usage/parser/SecurityGroupUsageParser.java     |    2 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |    2 +-
 .../cloud/usage/parser/VMInstanceUsageParser.java  |    2 +-
 .../com/cloud/usage/parser/VPNUserUsageParser.java |    2 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |    2 +-
 .../cloud/utils/component/ComponentContext.java    |    8 +
 .../utils/crypt/EncryptionSecretKeyChecker.java    |   15 +-
 utils/src/com/cloud/utils/db/Transaction.java      |   14 +-
 utils/src/com/cloud/utils/net/NetUtils.java        |   84 +-
 utils/test/com/cloud/utils/net/NetUtilsTest.java   |   26 +-
 124 files changed, 4313 insertions(+), 1565 deletions(-)
----------------------------------------------------------------------



Mime
View raw message