You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/12 08:43:29 UTC
[1/41] git commit: Merge branch 'master' into 4.0
Updated Branches:
refs/heads/4.0 9c7ae1ead -> c7ff8a0e5
Merge branch 'master' into 4.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c7ff8a0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c7ff8a0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c7ff8a0e
Branch: refs/heads/4.0
Commit: c7ff8a0e56b23b478a7c6c078a5fec4ffc70738a
Parents: 9c7ae1e f93dd21
Author: Edison Su <di...@gmail.com>
Authored: Tue Sep 11 23:31:26 2012 -0700
Committer: Edison Su <di...@gmail.com>
Committed: Tue Sep 11 23:31:26 2012 -0700
----------------------------------------------------------------------
.gitignore | 4 +
api/src/com/cloud/api/ApiConstants.java | 1 +
.../cloud/api/commands/CreateDiskOfferingCmd.java | 11 +-
api/src/com/cloud/api/commands/CreateZoneCmd.java | 13 +-
api/src/com/cloud/api/commands/DeployVMCmd.java | 14 +-
api/src/com/cloud/api/commands/UpdateZoneCmd.java | 10 +-
.../cloud/api/response/DiskOfferingResponse.java | 10 +
api/src/com/cloud/api/response/ZoneResponse.java | 7 +
api/src/com/cloud/dc/DataCenter.java | 1 +
api/src/com/cloud/vm/VirtualMachineProfile.java | 5 +
awsapi/deploy-cloud-bridge.sh | 136 ----
awsapi/install.sh | 33 -
awsapi/modules/.gitignore | 54 ++
awsapi/packages/config/debian/changelog | 12 -
awsapi/packages/config/debian/cloud-bridge.install | 21 -
.../packages/config/debian/cloud-bridge.postinst | 40 --
awsapi/packages/config/debian/control | 13 -
awsapi/packages/config/debian/rules | 119 ----
awsapi/packages/config/rpm/cloudbridge.spec | 98 ---
awsapi/release-notes.html | 123 ----
awsapi/release-notes.txt | 23 -
awsapi/waf | Bin 92487 -> 0 bytes
awsapi/wscript | 267 --------
awsapi/wscript_build | 61 --
awsapi/wscript_configure | 113 ----
build/build-aws-api.xml | 9 +-
build/build-cloud.xml | 2 +-
build/developer.xml | 5 +-
.../WEB-INF/classes/resources/messages.properties | 1 +
.../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 2 +-
cloud.spec | 11 +-
console-proxy/pom.xml | 4 +-
debian/cloud-agent.conffiles | 2 -
debian/cloud-client.conffiles | 3 -
debian/cloud-deps.install | 5 +-
debian/control | 4 +-
docs/en-US/LDAPserver-for-user-authentication.xml | 33 +-
docs/en-US/about-clusters.xml | 2 +-
docs/en-US/about-hosts.xml | 34 +-
docs/en-US/about-physical-networks.xml | 38 +-
docs/en-US/about-pods.xml | 41 +-
docs/en-US/about-primary-storage.xml | 2 +-
docs/en-US/about-secondary-storage.xml | 2 +-
docs/en-US/about-virtual-networks.xml | 39 +-
docs/en-US/about-working-with-vms.xml | 54 +-
docs/en-US/about-zones.xml | 37 +-
docs/en-US/accessing-vms.xml | 66 ++-
docs/en-US/accounts-users-domains.xml | 31 +-
docs/en-US/accounts.xml | 35 +-
docs/en-US/add-additional-guest-network.xml | 70 ++-
docs/en-US/add-ingress-egress-rules.xml | 123 +++--
docs/en-US/add-iso.xml | 178 +++---
docs/en-US/add-load-balancer-rule.xml | 84 ++-
docs/en-US/add-security-group.xml | 54 +-
docs/en-US/advanced-zone-configuration.xml | 437 ++++++++-----
docs/en-US/advanced-zone-guest-ip-addresses.xml | 33 +-
docs/en-US/advanced-zone-network-traffic-types.xml | 35 +-
...dvanced-zone-physical-network-configuration.xml | 39 +-
docs/en-US/advanced-zone-public-ip-addresses.xml | 33 +-
docs/en-US/alerts.xml | 96 ++--
docs/en-US/attach-iso-to-vm.xml | 59 +-
.../automatic-snapshot-creation-retention.xml | 47 +-
docs/en-US/basic-zone-configuration.xml | 39 +-
docs/en-US/basic-zone-guest-ip-addresses.xml | 35 +-
docs/en-US/basic-zone-network-traffic-types.xml | 35 +-
.../basic-zone-physical-network-configuration.xml | 38 +-
docs/en-US/best-practices-for-vms.xml | 55 ++-
.../change-network-offering-on-guest-network.xml | 77 ++-
docs/en-US/changing-root-password.xml | 37 +-
docs/en-US/changing-secondary-storage-ip.xml | 74 ++--
docs/en-US/changing-service-offering-for-vm.xml | 83 ++--
docs/en-US/changing-vm-name-os-group.xml | 95 ++--
docs/en-US/cloud-infrastructure-concepts.xml | 50 +-
docs/en-US/cloud-infrastructure-overview.xml | 75 ++--
docs/en-US/cloudstack_admin.xml | 59 ++-
docs/en-US/cluster-add.xml | 39 +-
docs/en-US/compute-disk-service-offerings.xml | 40 +-
docs/en-US/concepts.xml | 41 +-
.../configure-guest-traffic-in-advanced-zone.xml | 88 ++--
docs/en-US/configure-usage-server.xml | 47 +-
docs/en-US/configure-vpn.xml | 87 ++--
docs/en-US/console-proxy.xml | 33 +-
docs/en-US/convert-hyperv-vm-to-template.xml | 117 ++--
docs/en-US/create-template-from-existing-vm.xml | 87 ++--
docs/en-US/create-template-from-snapshot.xml | 38 +-
docs/en-US/create-templates-overview.xml | 52 +-
docs/en-US/create-windows-template.xml | 58 +-
docs/en-US/creating-compute-offerings.xml | 74 ++-
docs/en-US/creating-network-offerings.xml | 122 +++--
docs/en-US/creating-new-volumes.xml | 88 ++-
docs/en-US/creating-vms.xml | 86 ++--
docs/en-US/default-account-resource-limit.xml | 53 +-
docs/en-US/deleting-vms.xml | 66 +-
docs/en-US/deployment-architecture-overview.xml | 69 +-
docs/en-US/detach-move-volumes.xml | 71 ++-
docs/en-US/developer-guide.xml | 39 +-
docs/en-US/enable-disable-static-nat.xml | 70 ++-
docs/en-US/enable-security-groups.xml | 39 +-
docs/en-US/end-user-ui-overview.xml | 37 +-
docs/en-US/event-log-queries.xml | 33 +-
docs/en-US/event-types.xml | 425 +++++++-------
docs/en-US/events-log.xml | 43 +-
docs/en-US/events.xml | 31 +-
.../external-firewalls-and-load-balancers.xml | 38 +-
docs/en-US/feature-overview.xml | 117 ++--
docs/en-US/firewall-rules.xml | 91 ++--
docs/en-US/globally-configured-limits.xml | 178 +++---
docs/en-US/guest-traffic.xml | 55 +-
docs/en-US/ha-for-hosts.xml | 35 +-
docs/en-US/host-add.xml | 48 +-
docs/en-US/host-allocation.xml | 33 +-
.../hypervisor-support-for-primarystorage.xml | 183 +++---
docs/en-US/images/cluster-overview.png | Bin 6973 -> 6080 bytes
docs/en-US/import-ami.xml | 108 ++--
docs/en-US/initialize-and-test.xml | 102 ++--
docs/en-US/installation-complete.xml | 39 ++
docs/en-US/ip-forwarding-firewalling.xml | 34 +-
docs/en-US/isolated-networks.xml | 33 +-
docs/en-US/linux-installation.xml | 82 ++--
docs/en-US/load-balancer-rules.xml | 37 +-
docs/en-US/log-in-root-admin.xml | 34 +-
docs/en-US/log-in.xml | 44 +-
docs/en-US/maintain-hypervisors-on-hosts.xml | 33 +-
docs/en-US/manage-cloud.xml | 45 +-
docs/en-US/manual-live-migration.xml | 83 ++--
...grate-vm-rootvolume-volume-new-storage-pool.xml | 54 +-
docs/en-US/minimum-system-requirements.xml | 153 +++---
docs/en-US/network-offerings.xml | 46 +-
docs/en-US/network-service-providers.xml | 133 ++++-
docs/en-US/networking-in-a-pod.xml | 69 ++-
docs/en-US/networking-in-a-zone.xml | 56 +-
docs/en-US/networking-overview.xml | 51 +-
docs/en-US/pod-add.xml | 51 +-
docs/en-US/port-forwarding.xml | 80 ++--
docs/en-US/prepare-system-vm-template.xml | 57 ++
docs/en-US/primary-storage-add.xml | 60 ++-
docs/en-US/primary-storage.xml | 42 +-
docs/en-US/projects.xml | 53 +-
docs/en-US/provisioning-steps-overview.xml | 70 +--
docs/en-US/provisioning-steps.xml | 36 +-
docs/en-US/release-ip-address.xml | 64 +-
docs/en-US/removing-vsphere-hosts.xml | 32 +-
...untime-allocation-virtual-network-resources.xml | 37 +-
...cheduled-maintenance-maintenance-mode-hosts.xml | 34 +-
docs/en-US/secondary-storage-add.xml | 41 +-
docs/en-US/secondary-storage-vm.xml | 41 +-
docs/en-US/secondary-storage.xml | 38 +-
docs/en-US/security-groups.xml | 36 +-
docs/en-US/set-up-invitations.xml | 53 +-
docs/en-US/set-up-network-for-users.xml | 46 +-
docs/en-US/set-usage-limit.xml | 36 +-
docs/en-US/shared-networks.xml | 38 +-
docs/en-US/site-to-site-vpn.xml | 72 ++-
docs/en-US/standard-events.xml | 35 +-
docs/en-US/static-nat.xml | 34 +-
docs/en-US/stop-restart-management-server.xml | 33 +-
docs/en-US/stopping-and-starting-vms.xml | 7 +-
docs/en-US/storage.xml | 43 +-
docs/en-US/suspend-project.xml | 48 +-
docs/en-US/sys-reliability-and-ha.xml | 45 +-
docs/en-US/sysprep-for-windows-server-2003R2.xml | 96 ++--
docs/en-US/sysprep-windows-server-2008R2.xml | 48 +-
docs/en-US/system-reserved-ip-addresses.xml | 36 +-
docs/en-US/system-service-offerings.xml | 34 +-
docs/en-US/time-zones.xml | 259 ++++----
docs/en-US/troubleshooting.xml | 52 +-
docs/en-US/tuning.xml | 36 +-
docs/en-US/ui.xml | 35 +-
docs/en-US/upload-template.xml | 100 ++--
docs/en-US/user-services-overview.xml | 119 +---
docs/en-US/using-multiple-guest-networks.xml | 43 +-
docs/en-US/using-sshkeys.xml | 95 ++--
docs/en-US/vcenter-maintenance-mode.xml | 36 +-
docs/en-US/virtual-router.xml | 35 +-
docs/en-US/vm-lifecycle.xml | 63 +-
docs/en-US/vm-storage-migration.xml | 44 +-
docs/en-US/vpc.xml | 160 ++++-
docs/en-US/vpn.xml | 58 +-
docs/en-US/windows-installation.xml | 37 +-
docs/en-US/work-with-usage.xml | 47 +-
docs/en-US/working-with-hosts.xml | 51 +-
docs/en-US/working-with-iso.xml | 43 +-
docs/en-US/working-with-snapshots.xml | 49 +-
docs/en-US/working-with-system-vm.xml | 39 +-
docs/en-US/working-with-templates.xml | 44 +-
docs/en-US/working-with-volumes.xml | 46 +-
docs/en-US/xenserver-maintenance-mode.xml | 40 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 2 +-
server/src/com/cloud/api/ApiDBUtils.java | 6 +-
server/src/com/cloud/api/ApiResponseHelper.java | 21 +-
server/src/com/cloud/configuration/Config.java | 1 -
.../cloud/configuration/ConfigurationManager.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 26 +-
server/src/com/cloud/dc/DataCenterVO.java | 26 +-
.../network/element/CloudZonesNetworkElement.java | 24 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 489 ++++++++-------
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 13 +-
.../src/com/cloud/server/ManagementServerImpl.java | 2 +-
.../cloud/storage/LocalStoragePoolListener.java | 10 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 64 ++-
.../allocator/AbstractStoragePoolAllocator.java | 4 +-
.../allocator/FirstFitStoragePoolAllocator.java | 10 +-
.../allocator/LocalStoragePoolAllocator.java | 40 +-
.../storage/allocator/StoragePoolAllocator.java | 2 +-
.../allocator/UseLocalForRootAllocator.java | 17 +-
server/src/com/cloud/test/DatabaseConfig.java | 5 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 72 ++-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 5 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 9 +-
setup/db/create-schema.sql | 1 +
setup/db/db/schema-302to40.sql | 4 +
tools/junit/junit-4.8.1.jar | Bin 237047 -> 0 bytes
tools/marvin/marvin/marvinPlugin.py | 5 +-
ui/dictionary.jsp | 3 +
ui/scripts/configuration.js | 13 +-
ui/scripts/storage.js | 10 +-
ui/scripts/system.js | 11 +
wscript_build | 2 +-
wscript_configure | 4 +-
219 files changed, 5863 insertions(+), 5827 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c7ff8a0e/build/build-cloud.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c7ff8a0e/cloud.spec
----------------------------------------------------------------------