You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/18 18:21:25 UTC
[36/38] git commit: refs/heads/qemu-img - Merge branch 'master' into
qemu-img
Merge branch 'master' into qemu-img
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0db51b39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0db51b39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0db51b39
Branch: refs/heads/qemu-img
Commit: 0db51b39e2e234ba8664969e3e9857523f078735
Parents: dcb0484 a4ed061
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Feb 18 15:08:12 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Feb 18 15:08:12 2013 +0100
----------------------------------------------------------------------
LICENSE | 25 +
.../com/cloud/exception/RequestLimitException.java | 1 -
.../cloud/hypervisor/HypervisorCapabilities.java | 6 +
api/src/com/cloud/network/NetworkModel.java | 2 +
.../org/apache/cloudstack/api/ApiErrorCode.java | 1 -
.../org/apache/cloudstack/query/QueryService.java | 1 -
.../cloudstack/api/command/test/UsageCmdTest.java | 69 +
client/pom.xml | 5 +-
.../cloud/hypervisor/HypervisorCapabilitiesVO.java | 12 +
developer/developer-prefill.sql | 20 +-
developer/pom.xml | 121 +-
docs/en-US/console-proxy.xml | 6 +-
docs/en-US/creating-network-offerings.xml | 2 +-
docs/en-US/egress-firewall-rule.xml | 98 +
docs/en-US/firewall-rules.xml | 119 +-
docs/en-US/images/egress-firewall-rule.png | Bin 0 -> 10413 bytes
docs/en-US/ip-forwarding-firewalling.xml | 44 +-
docs/en-US/working-with-system-vm.xml | 56 +-
packaging/centos63/cloud-agent.rc | 5 +-
packaging/centos63/cloud-usage.rc | 5 +-
packaging/centos63/package.sh | 2 +-
.../cloudstack/ratelimit/ApiRateLimitService.java | 1 -
.../cloudstack/ratelimit/EhcacheLimitStore.java | 1 -
.../apache/cloudstack/ratelimit/LimitStore.java | 1 -
.../apache/cloudstack/ratelimit/StoreEntry.java | 1 -
.../cloudstack/ratelimit/StoreEntryImpl.java | 1 -
.../cloudstack/ratelimit/integration/APITest.java | 2 -
.../ratelimit/integration/LoginResponse.java | 2 -
.../integration/RateLimitIntegrationTest.java | 3 -
.../kvm/resource/LibvirtComputingResource.java | 5 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 128 +-
.../hypervisor/vmware/manager/VmwareManager.java | 5 -
.../vmware/manager/VmwareManagerImpl.java | 23 +-
pom.xml | 118 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 19 +-
server/src/com/cloud/api/ApiServer.java | 13 +-
.../com/cloud/api/query/ViewResponseHelper.java | 1 -
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 10 +-
.../cloud/api/query/vo/ControlledViewEntity.java | 1 -
server/src/com/cloud/api/query/vo/HostJoinVO.java | 1 -
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 1 -
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 7 +-
server/src/com/cloud/configuration/Config.java | 1 -
.../hypervisor/dao/HypervisorCapabilitiesDao.java | 2 +
.../dao/HypervisorCapabilitiesDaoImpl.java | 87 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 4 +-
server/src/com/cloud/network/NetworkModelImpl.java | 32 +
.../src/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 37 +-
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 73 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 17 +-
server/test/com/cloud/api/APITest.java | 2 -
server/test/com/cloud/api/ListPerfTest.java | 2 -
server/test/com/cloud/api/LoginResponse.java | 2 -
.../com/cloud/network/MockNetworkModelImpl.java | 6 +
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 6 +
setup/bindir/cloud-setup-databases.in | 4 +-
setup/db/4.1-new-db-schema.sql | 142 -
setup/db/create-schema-view.sql | 1152 ----
setup/db/create-schema.sql | 299 +-
setup/db/db/schema-40to410-cleanup.sql | 21 +
setup/db/db/schema-40to410.sql | 471 ++-
setup/db/db/schema-410to420-cleanup.sql | 21 +
setup/db/db/schema-410to420.sql | 25 +
setup/db/deploy-db-dev.sh | 11 -
setup/db/deploy-db-simulator.sh | 11 -
tools/apidoc/pom.xml | 14 +-
tools/appliance/build.sh | 61 +
.../definitions/systemvmtemplate/cleanup.sh | 4 -
.../definitions/systemvmtemplate/definition.rb | 2 +-
.../definitions/systemvmtemplate/preseed.cfg | 64 +-
.../definitions/systemvmtemplate/zerodisk.sh | 2 -
tools/cli/pom.xml | 6 +-
tools/devcloud-kvm/pom.xml | 4 +-
tools/devcloud/pom.xml | 4 +-
tools/marvin/marvin/deployDataCenter.py | 8 +-
tools/marvin/pom.xml | 66 +-
tools/pom.xml | 44 +
tools/whisker/LICENSE | 4958 ++++++++++++++-
tools/whisker/descriptor-for-packaging.xml | 12 +
tools/whisker/descriptor.xml | 12 +
usage/pom.xml | 14 +
usage/resources/usageApplicationContext.xml | 5 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 2 +
.../cloud/usage/UsageServerComponentConfig.java | 180 -
.../usage/parser/NetworkOfferingUsageParser.java | 3 +-
.../com/cloud/usage/parser/NetworkUsageParser.java | 2 +
.../usage/parser/PortForwardingUsageParser.java | 5 +-
.../usage/parser/SecurityGroupUsageParser.java | 3 +-
.../com/cloud/usage/parser/StorageUsageParser.java | 3 +-
.../cloud/usage/parser/VMInstanceUsageParser.java | 9 +-
.../com/cloud/usage/parser/VPNUserUsageParser.java | 3 +-
.../com/cloud/usage/parser/VolumeUsageParser.java | 3 +-
usage/test/com/cloud/usage/UsageManagerTest.java | 97 +
.../cloud/usage/UsageManagerTestConfiguration.java | 94 +
usage/test/resources/UsageManagerTestContext.xml | 42 +
usage/test/resources/db.properties | 70 +
utils/pom.xml | 5 +
utils/src/com/cloud/utils/StringUtils.java | 5 +
utils/test/com/cloud/utils/db/TransactionTest.java | 12 +-
100 files changed, 6696 insertions(+), 2496 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0db51b39/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------