You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/13 23:59:37 UTC
[30/35] git commit: refs/heads/master - Merge branch 'master' into
ui-plugins
Merge branch 'master' into ui-plugins
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/22636d52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/22636d52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/22636d52
Branch: refs/heads/master
Commit: 22636d520e152e4895785db7f0638fd7a76db46d
Parents: 313b604 5d09b9f
Author: Brian Federle <br...@citrix.com>
Authored: Mon Feb 11 11:48:31 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Feb 11 11:48:31 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkModel.java | 3 +
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 45 ++++++-
.../com/cloud/bridge/service/EC2RestServlet.java | 24 +++-
.../cloud/bridge/service/EC2SoapServiceImpl.java | 12 +-
.../cloud/bridge/service/core/ec2/EC2Engine.java | 112 +++++++--------
.../cloud/bridge/service/core/ec2/EC2Instance.java | 12 +-
.../service/core/ec2/EC2InstanceFilterSet.java | 7 +-
client/tomcatconf/tomcat6-nonssl.conf.in | 2 +-
client/tomcatconf/tomcat6-ssl.conf.in | 2 +-
developer/pom.xml | 12 ++
docs/.tx/config | 14 ++
docs/pot/Admin_Guide.pot | 17 ++-
docs/pot/Author_Group.pot | 17 ++-
docs/pot/Book_Info.pot | 17 ++-
docs/pot/Book_Info_Release_Notes_4-0.pot | 17 ++-
docs/pot/CloudStack_Nicira_NVP_Guide.pot | 17 ++-
docs/pot/Common_Content/Legal_Notice.pot | 17 ++-
docs/pot/Developers_Guide.pot | 17 ++-
docs/pot/Installation_Guide.pot | 17 ++-
docs/pot/LDAPserver-for-user-authentication.pot | 17 ++-
docs/pot/Preface.pot | 17 ++-
docs/pot/Release_Notes.pot | 17 ++-
docs/pot/Revision_History.pot | 17 ++-
docs/pot/Revision_History_Install_Guide.pot | 17 ++-
docs/pot/SSL-keystore-path-and-password.pot | 17 ++-
docs/pot/VPN-user-usage-record-format.pot | 17 ++-
docs/pot/about-clusters.pot | 17 ++-
docs/pot/about-hosts.pot | 17 ++-
docs/pot/about-password-encryption.pot | 17 ++-
docs/pot/about-physical-networks.pot | 17 ++-
docs/pot/about-pods.pot | 17 ++-
docs/pot/about-primary-storage.pot | 17 ++-
docs/pot/about-secondary-storage.pot | 17 ++-
docs/pot/about-security-groups.pot | 17 ++-
docs/pot/about-virtual-networks.pot | 17 ++-
docs/pot/about-working-with-vms.pot | 17 ++-
docs/pot/about-zones.pot | 17 ++-
docs/pot/accept-membership-invite.pot | 17 ++-
docs/pot/accessing-vms.pot | 17 ++-
docs/pot/accounts-users-domains.pot | 17 ++-
docs/pot/accounts.pot | 17 ++-
docs/pot/acquire-new-ip-address.pot | 17 ++-
docs/pot/acquire-new-ip-for-vpc.pot | 17 ++-
docs/pot/add-additional-guest-network.pot | 17 ++-
docs/pot/add-clusters-kvm-xenserver.pot | 17 ++-
docs/pot/add-clusters-ovm.pot | 17 ++-
docs/pot/add-clusters-vsphere.pot | 17 ++-
docs/pot/add-gateway-vpc.pot | 17 ++-
docs/pot/add-ingress-egress-rules.pot | 17 ++-
docs/pot/add-iso.pot | 17 ++-
docs/pot/add-load-balancer-rule.pot | 17 ++-
docs/pot/add-loadbalancer-rule-vpc.pot | 17 ++-
docs/pot/add-members-to-projects.pot | 17 ++-
docs/pot/add-more-clusters.pot | 17 ++-
docs/pot/add-password-management-to-templates.pot | 17 ++-
docs/pot/add-portforward-rule-vpc.pot | 17 ++-
docs/pot/add-primary-storage.pot | 17 ++-
docs/pot/add-projects-members-from-ui.pot | 17 ++-
docs/pot/add-secondary-storage.pot | 17 ++-
docs/pot/add-security-group.pot | 17 ++-
docs/pot/add-tier.pot | 17 ++-
docs/pot/add-vm-to-tier.pot | 17 ++-
docs/pot/add-vpc.pot | 17 ++-
docs/pot/added-API-commands-4-0.pot | 17 ++-
docs/pot/added-API-commands.pot | 17 ++-
docs/pot/added-error-codes.pot | 17 ++-
.../adding-IP-addresses-for-the-public-network.pot | 17 ++-
docs/pot/additional-installation-options.pot | 17 ++-
docs/pot/admin-alerts.pot | 17 ++-
docs/pot/admin-guide.pot | 17 ++-
docs/pot/adv-zone-topology-req.pot | 17 ++-
docs/pot/advanced-zone-configuration.pot | 17 ++-
docs/pot/advanced-zone-guest-ip-addresses.pot | 17 ++-
docs/pot/advanced-zone-network-traffic-types.pot | 17 ++-
...dvanced-zone-physical-network-configuration.pot | 17 ++-
docs/pot/advanced-zone-public-ip-addresses.pot | 17 ++-
docs/pot/alerts.pot | 17 ++-
docs/pot/allocators.pot | 17 ++-
docs/pot/api-calls.pot | 17 ++-
docs/pot/api-overview.pot | 17 ++-
docs/pot/api-reference.pot | 17 ++-
docs/pot/asynchronous-commands-example.pot | 17 ++-
docs/pot/asynchronous-commands.pot | 17 ++-
docs/pot/attach-iso-to-vm.pot | 17 ++-
docs/pot/attaching-volume.pot | 17 ++-
docs/pot/automatic-snapshot-creation-retention.pot | 17 ++-
docs/pot/autoscale.pot | 17 ++-
docs/pot/aws-api-examples.pot | 17 ++-
docs/pot/aws-ec2-configuration.pot | 17 ++-
docs/pot/aws-ec2-introduction.pot | 17 ++-
docs/pot/aws-ec2-requirements.pot | 17 ++-
docs/pot/aws-ec2-supported-commands.pot | 17 ++-
docs/pot/aws-ec2-timeouts.pot | 17 ++-
docs/pot/aws-ec2-user-setup.pot | 17 ++-
docs/pot/aws-interface-compatibility.pot | 17 ++-
docs/pot/basic-adv-networking.pot | 17 ++-
docs/pot/basic-zone-configuration.pot | 17 ++-
docs/pot/basic-zone-guest-ip-addresses.pot | 17 ++-
docs/pot/basic-zone-network-traffic-types.pot | 17 ++-
.../basic-zone-physical-network-configuration.pot | 17 ++-
docs/pot/best-practices-for-vms.pot | 17 ++-
docs/pot/best-practices-primary-storage.pot | 17 ++-
docs/pot/best-practices-secondary-storage.pot | 17 ++-
docs/pot/best-practices-templates.pot | 17 ++-
docs/pot/best-practices-virtual-router.pot | 17 ++-
docs/pot/build-deb.pot | 17 ++-
docs/pot/build-rpm.pot | 17 ++-
docs/pot/building-devcloud.pot | 17 ++-
docs/pot/building-marvin.pot | 17 ++-
docs/pot/building-prerequisites.pot | 17 ++-
docs/pot/building-with-maven-deploy.pot | 17 ++-
docs/pot/building-with-maven-steps.pot | 17 ++-
docs/pot/building-with-maven.pot | 17 ++-
docs/pot/castor-with-cs.pot | 17 ++-
...change-console-proxy-ssl-certificate-domain.pot | 17 ++-
docs/pot/change-database-config.pot | 17 ++-
docs/pot/change-database-password.pot | 17 ++-
docs/pot/change-host-password.pot | 17 ++-
.../change-network-offering-on-guest-network.pot | 17 ++-
docs/pot/change-to-behavior-of-list-commands.pot | 17 ++-
docs/pot/changed-apicommands-4-0.pot | 17 ++-
docs/pot/changing-root-password.pot | 17 ++-
docs/pot/changing-secondary-storage-ip.pot | 17 ++-
docs/pot/changing-secondary-storage-servers.pot | 17 ++-
docs/pot/changing-service-offering-for-vm.pot | 17 ++-
docs/pot/changing-vm-name-os-group.pot | 17 ++-
docs/pot/choosing-a-deployment-architecture.pot | 17 ++-
docs/pot/cisco3750-hardware.pot | 17 ++-
docs/pot/cisco3750-layer2.pot | 17 ++-
docs/pot/citrix-xenserver-installation.pot | 17 ++-
docs/pot/cloud-infrastructure-concepts.pot | 17 ++-
docs/pot/cloud-infrastructure-overview.pot | 17 ++-
docs/pot/cloudstack-api.pot | 17 ++-
docs/pot/cloudstack.pot | 17 ++-
docs/pot/cluster-add.pot | 17 ++-
docs/pot/compatibility-matrix.pot | 17 ++-
docs/pot/compute-disk-service-offerings.pot | 17 ++-
docs/pot/concepts.pot | 17 ++-
docs/pot/configure-acl.pot | 17 ++-
.../configure-guest-traffic-in-advanced-zone.pot | 17 ++-
docs/pot/configure-package-repository.pot | 17 ++-
...onfigure-public-traffic-in-an-advanced-zone.pot | 17 ++-
docs/pot/configure-snmp-rhel.pot | 17 ++-
docs/pot/configure-usage-server.pot | 17 ++-
docs/pot/configure-virtual-router.pot | 17 ++-
docs/pot/configure-vpc.pot | 17 ++-
docs/pot/configure-vpn.pot | 17 ++-
docs/pot/configure-xenserver-dom0-memory.pot | 17 ++-
docs/pot/configuring-projects.pot | 17 ++-
docs/pot/console-proxy.pot | 17 ++-
docs/pot/convert-hyperv-vm-to-template.pot | 17 ++-
docs/pot/create-bare-metal-template.pot | 17 ++-
docs/pot/create-new-projects.pot | 17 ++-
docs/pot/create-template-from-existing-vm.pot | 17 ++-
docs/pot/create-template-from-snapshot.pot | 17 ++-
docs/pot/create-templates-overview.pot | 17 ++-
docs/pot/create-vpn-connection-vpc.pot | 17 ++-
docs/pot/create-vpn-customer-gateway.pot | 17 ++-
docs/pot/create-vpn-gateway-for-vpc.pot | 17 ++-
docs/pot/create-vr-network-offering.pot | 17 ++-
docs/pot/create-windows-template.pot | 17 ++-
docs/pot/creating-compute-offerings.pot | 17 ++-
docs/pot/creating-disk-offerings.pot | 17 ++-
docs/pot/creating-network-offerings.pot | 17 ++-
docs/pot/creating-new-volumes.pot | 17 ++-
docs/pot/creating-system-service-offerings.pot | 17 ++-
docs/pot/creating-vms.pot | 17 ++-
docs/pot/customizing-dns.pot | 17 ++-
docs/pot/database-replication.pot | 17 ++-
docs/pot/dates-in-usage-record.pot | 17 ++-
docs/pot/dedicated-ha-hosts.pot | 17 ++-
docs/pot/default-account-resource-limit.pot | 17 ++-
docs/pot/default-template.pot | 17 ++-
docs/pot/delete-reset-vpn.pot | 17 ++-
docs/pot/delete-templates.pot | 17 ++-
docs/pot/deleting-vms.pot | 17 ++-
docs/pot/dell62xx-hardware.pot | 17 ++-
docs/pot/dell62xx-layer2.pot | 17 ++-
docs/pot/deployment-architecture-overview.pot | 17 ++-
docs/pot/detach-move-volumes.pot | 17 ++-
docs/pot/devcloud-usage-mode.pot | 17 ++-
docs/pot/devcloud.pot | 17 ++-
docs/pot/developer-getting-started.pot | 17 ++-
docs/pot/developer-introduction.pot | 17 ++-
docs/pot/disable-enable-zones-pods-clusters.pot | 17 ++-
docs/pot/disk-volume-usage-record-format.pot | 17 ++-
docs/pot/dns-dhcp.pot | 17 ++-
docs/pot/domains.pot | 17 ++-
docs/pot/enable-disable-static-nat-vpc.pot | 17 ++-
docs/pot/enable-disable-static-nat.pot | 17 ++-
docs/pot/enable-security-groups.pot | 17 ++-
docs/pot/enabling-api-call-expiration.pot | 17 ++-
docs/pot/enabling-port-8096.pot | 17 ++-
docs/pot/end-user-ui-overview.pot | 17 ++-
docs/pot/error-handling.pot | 17 ++-
docs/pot/event-log-queries.pot | 17 ++-
docs/pot/event-types.pot | 17 ++-
docs/pot/events-log.pot | 17 ++-
docs/pot/events.pot | 17 ++-
docs/pot/example-LDAP-configuration-commands.pot | 17 ++-
.../pot/example-response-from-listUsageRecords.pot | 17 ++-
docs/pot/export-template.pot | 17 ++-
docs/pot/external-firewalls-and-load-balancers.pot | 17 ++-
docs/pot/external-fw-topology-req.pot | 17 ++-
docs/pot/external-guest-firewall-integration.pot | 17 ++-
docs/pot/external-guest-lb-integration.pot | 17 ++-
docs/pot/extracting-source.pot | 17 ++-
docs/pot/feature-overview.pot | 17 ++-
docs/pot/firewall-rules.pot | 17 ++-
docs/pot/first_ms_node_install.pot | 17 ++-
docs/pot/generic-firewall-provisions.pot | 17 ++-
docs/pot/getting-release.pot | 17 ++-
docs/pot/global-config.pot | 17 ++-
docs/pot/globally-configured-limits.pot | 17 ++-
docs/pot/guest-ip-ranges.pot | 17 ++-
docs/pot/guest-network.pot | 17 ++-
docs/pot/guest-nw-usage-with-traffic-sentinel.pot | 17 ++-
docs/pot/guest-traffic.pot | 17 ++-
docs/pot/ha-enabled-vm.pot | 17 ++-
docs/pot/ha-for-hosts.pot | 17 ++-
docs/pot/ha-management-server.pot | 17 ++-
docs/pot/hardware-config-eg.pot | 17 ++-
docs/pot/hardware-firewall.pot | 17 ++-
docs/pot/host-add-vsphere.pot | 17 ++-
docs/pot/host-add-xenserver-kvm-ovm.pot | 17 ++-
docs/pot/host-add.pot | 17 ++-
docs/pot/host-allocation.pot | 17 ++-
docs/pot/hypervisor-host-install-agent.pot | 17 ++-
docs/pot/hypervisor-host-install-finish.pot | 17 ++-
docs/pot/hypervisor-host-install-firewall.pot | 17 ++-
docs/pot/hypervisor-host-install-libvirt.pot | 17 ++-
...hypervisor-host-install-network-openvswitch.pot | 17 ++-
docs/pot/hypervisor-host-install-network.pot | 17 ++-
docs/pot/hypervisor-host-install-overview.pot | 17 ++-
docs/pot/hypervisor-host-install-prepare-os.pot | 17 ++-
.../hypervisor-host-install-security-policies.pot | 17 ++-
docs/pot/hypervisor-installation.pot | 17 ++-
docs/pot/hypervisor-kvm-install-flow.pot | 17 ++-
docs/pot/hypervisor-kvm-requirements.pot | 17 ++-
docs/pot/hypervisor-support-for-primarystorage.pot | 17 ++-
docs/pot/import-ami.pot | 17 ++-
docs/pot/increase-management-server-max-memory.pot | 17 ++-
docs/pot/incremental-snapshots-backup.pot | 17 ++-
...l-setup-of-external-firewalls-loadbalancers.pot | 17 ++-
docs/pot/initialize-and-test.pot | 17 ++-
docs/pot/install-usage-server.pot | 17 ++-
docs/pot/installation-complete.pot | 17 ++-
docs/pot/installation-steps-overview.pot | 17 ++-
docs/pot/installation.pot | 17 ++-
docs/pot/installation_steps_overview.pot | 17 ++-
docs/pot/inter-vlan-routing.pot | 17 ++-
docs/pot/introduction.pot | 17 ++-
docs/pot/ip-forwarding-firewalling.pot | 17 ++-
docs/pot/ip-load-balancing.pot | 17 ++-
docs/pot/ipaddress-usage-record-format.pot | 17 ++-
docs/pot/isolated-networks.pot | 17 ++-
docs/pot/job-status.pot | 17 ++-
docs/pot/kvm-topology-req.pot | 17 ++-
docs/pot/large_scale_redundant_setup.pot | 17 ++-
docs/pot/layer2-switch.pot | 17 ++-
.../lb-policy-pfwd-rule-usage-record-format.pot | 17 ++-
docs/pot/linux-installation.pot | 17 ++-
docs/pot/load-balancer-rules.pot | 17 ++-
docs/pot/log-in-root-admin.pot | 17 ++-
docs/pot/log-in.pot | 17 ++-
docs/pot/long-running-job-events.pot | 17 ++-
docs/pot/maintain-hypervisors-on-hosts.pot | 17 ++-
docs/pot/maintenance-mode-for-primary-storage.pot | 17 ++-
docs/pot/making-api-request.pot | 17 ++-
docs/pot/manage-cloud.pot | 17 ++-
docs/pot/management-server-install-client.pot | 17 ++-
docs/pot/management-server-install-complete.pot | 17 ++-
docs/pot/management-server-install-db-external.pot | 17 ++-
docs/pot/management-server-install-db-local.pot | 17 ++-
docs/pot/management-server-install-db.pot | 17 ++-
docs/pot/management-server-install-flow.pot | 17 ++-
docs/pot/management-server-install-multi-node.pot | 17 ++-
docs/pot/management-server-install-nfs-shares.pot | 17 ++-
docs/pot/management-server-install-overview.pot | 17 ++-
docs/pot/management-server-install-prepare-os.pot | 17 ++-
docs/pot/management-server-install-systemvm.pot | 17 ++-
docs/pot/management-server-lb.pot | 17 ++-
docs/pot/management-server-overview.pot | 17 ++-
docs/pot/manual-live-migration.pot | 17 ++-
docs/pot/marvin.pot | 17 ++-
docs/pot/max-result-page-returned.pot | 17 ++-
.../migrate-datadisk-volume-new-storage-pool.pot | 17 ++-
...grate-vm-rootvolume-volume-new-storage-pool.pot | 17 ++-
docs/pot/minimum-system-requirements.pot | 17 ++-
docs/pot/modify-delete-service-offerings.pot | 17 ++-
docs/pot/multi_node_management_server.pot | 17 ++-
docs/pot/multi_node_overview.pot | 17 ++-
docs/pot/multi_site_deployment.pot | 17 ++-
docs/pot/multiple-system-vm-vmware.pot | 17 ++-
docs/pot/network-offering-usage-record-format.pot | 17 ++-
docs/pot/network-offerings.pot | 17 ++-
docs/pot/network-rate.pot | 17 ++-
docs/pot/network-service-providers.pot | 17 ++-
docs/pot/network-setup.pot | 17 ++-
docs/pot/network-usage-record-format.pot | 17 ++-
docs/pot/networking-in-a-pod.pot | 17 ++-
docs/pot/networking-in-a-zone.pot | 17 ++-
docs/pot/networking-overview.pot | 17 ++-
docs/pot/networking_overview.pot | 17 ++-
docs/pot/networks-for-users-overview.pot | 17 ++-
docs/pot/networks.pot | 17 ++-
docs/pot/nfs-shares-on-management-server.pot | 17 ++-
docs/pot/nfs-shares-on-separate-server.pot | 17 ++-
docs/pot/offerings.pot | 17 ++-
.../ongoing-config-of-external-firewalls-lb.pot | 17 ++-
.../over-provisioning-service-offering-limits.pot | 17 ++-
docs/pot/ovm-install.pot | 17 ++-
docs/pot/ovm-requirements.pot | 17 ++-
docs/pot/per-domain-limits.pot | 17 ++-
docs/pot/performance-monitoring.pot | 17 ++-
.../physical-network-configuration-settings.pot | 17 ++-
docs/pot/plugin-niciranvp-about.pot | 17 ++-
docs/pot/plugin-niciranvp-devicemanagement.pot | 17 ++-
docs/pot/plugin-niciranvp-features.pot | 17 ++-
docs/pot/plugin-niciranvp-guide.pot | 17 ++-
docs/pot/plugin-niciranvp-introduction.pot | 17 ++-
docs/pot/plugin-niciranvp-preparations.pot | 17 ++-
docs/pot/plugin-niciranvp-provider.pot | 17 ++-
docs/pot/plugin-niciranvp-revisions.pot | 17 ++-
docs/pot/plugin-niciranvp-tables.pot | 17 ++-
docs/pot/plugin-niciranvp-troubleshooting.pot | 17 ++-
docs/pot/plugin-niciranvp-ui.pot | 17 ++-
docs/pot/plugin-niciranvp-usage.pot | 17 ++-
docs/pot/plugin-niciranvp-uuidreferences.pot | 17 ++-
docs/pot/pod-add.pot | 17 ++-
docs/pot/port-forwarding.pot | 17 ++-
docs/pot/prepare-system-vm-template.pot | 17 ++-
docs/pot/primary-storage-add.pot | 17 ++-
docs/pot/primary-storage-outage-and-data-loss.pot | 17 ++-
docs/pot/primary-storage.pot | 17 ++-
docs/pot/private-public-template.pot | 17 ++-
docs/pot/projects-overview.pot | 17 ++-
docs/pot/projects.pot | 17 ++-
docs/pot/provisioning-auth-api.pot | 17 ++-
docs/pot/provisioning-steps-overview.pot | 17 ++-
docs/pot/provisioning-steps.pot | 17 ++-
docs/pot/query-filter.pot | 17 ++-
docs/pot/re-install-hosts.pot | 17 ++-
docs/pot/release-ip-address.pot | 17 ++-
docs/pot/release-ip-for-vpc.pot | 17 ++-
docs/pot/remove-member-from-project.pot | 17 ++-
docs/pot/remove-tier.pot | 17 ++-
docs/pot/remove-vpc.pot | 17 ++-
docs/pot/removed-API-commands.pot | 17 ++-
docs/pot/removing-hosts.pot | 17 ++-
docs/pot/removing-vsphere-hosts.pot | 17 ++-
docs/pot/removing-xenserver-kvm-hosts.pot | 17 ++-
docs/pot/requirements-templates.pot | 17 ++-
docs/pot/resizing-volumes.pot | 17 ++-
docs/pot/response-formats.pot | 17 ++-
docs/pot/responses.pot | 17 ++-
docs/pot/roles.pot | 17 ++-
docs/pot/root-admin-ui-overview.pot | 17 ++-
...untime-allocation-virtual-network-resources.pot | 17 ++-
docs/pot/runtime-behavior-of-primary-storage.pot | 17 ++-
docs/pot/runtime-internal-comm-req.pot | 17 ++-
...cheduled-maintenance-maintenance-mode-hosts.pot | 17 ++-
docs/pot/search-base.pot | 17 ++-
docs/pot/search-user-bind-dn.pot | 17 ++-
docs/pot/secondary-storage-add.pot | 17 ++-
.../pot/secondary-storage-outage-and-data-loss.pot | 17 ++-
docs/pot/secondary-storage-vm.pot | 17 ++-
docs/pot/secondary-storage.pot | 17 ++-
docs/pot/security-groups.pot | 17 ++-
docs/pot/security-req.pot | 17 ++-
docs/pot/send-projects-membership-invitation.pot | 17 ++-
docs/pot/separate_storage_network.pot | 17 ++-
docs/pot/service-offerings.pot | 17 ++-
docs/pot/set-database-buffer-pool-size.pot | 17 ++-
docs/pot/set-global-project-resource-limits.pot | 17 ++-
docs/pot/set-monitor-total-vm-limits-per-host.pot | 17 ++-
docs/pot/set-per-project-resource-limits.pot | 17 ++-
docs/pot/set-projects-creator-permissions.pot | 17 ++-
docs/pot/set-resource-limits-for-projects.pot | 17 ++-
docs/pot/set-up-invitations.pot | 17 ++-
docs/pot/set-up-network-for-users.pot | 17 ++-
docs/pot/set-usage-limit.pot | 17 ++-
docs/pot/set-zone-vlan-run-vm-max.pot | 17 ++-
docs/pot/shared-networks.pot | 17 ++-
docs/pot/signing-api-requests.pot | 17 ++-
docs/pot/site-to-site-vpn.pot | 17 ++-
docs/pot/small_scale_deployment.pot | 17 ++-
docs/pot/snapshot-restore.pot | 17 ++-
docs/pot/source-build.pot | 17 ++-
docs/pot/source-prereqs.pot | 17 ++-
docs/pot/source.pot | 17 ++-
docs/pot/ssl.pot | 17 ++-
docs/pot/standard-events.pot | 17 ++-
docs/pot/static-nat.pot | 17 ++-
docs/pot/sticky-session-policies-for-lb-rules.pot | 17 ++-
docs/pot/stop-restart-management-server.pot | 17 ++-
docs/pot/stopped-vm.pot | 17 ++-
docs/pot/stopping-and-starting-vms.pot | 17 ++-
docs/pot/storage-nw-topology-req.pot | 17 ++-
docs/pot/storage-overview.pot | 17 ++-
docs/pot/storage-tags.pot | 17 ++-
docs/pot/storage.pot | 17 ++-
docs/pot/suspend-project.pot | 17 ++-
docs/pot/sys-offering-sysvm.pot | 17 ++-
docs/pot/sys-reliability-and-ha.pot | 17 ++-
docs/pot/sysprep-for-windows-server-2003R2.pot | 17 ++-
docs/pot/sysprep-windows-server-2008R2.pot | 17 ++-
docs/pot/system-reserved-ip-addresses.pot | 17 ++-
docs/pot/system-service-offerings.pot | 17 ++-
docs/pot/system-vm-template.pot | 17 ++-
docs/pot/tagging-resources.pot | 17 ++-
.../template-iso-snapshot-usage-record-format.pot | 17 ++-
docs/pot/templates.pot | 17 ++-
docs/pot/time-zones.pot | 17 ++-
docs/pot/tools.pot | 17 ++-
docs/pot/topology-req.pot | 17 ++-
docs/pot/troubleshooting-alerts.pot | 17 ++-
docs/pot/troubleshooting-lb-rules-fails.pot | 17 ++-
...troubleshooting-recover-lost-virtual-router.pot | 17 ++-
docs/pot/troubleshooting-unable-to-deploy-vms.pot | 17 ++-
docs/pot/troubleshooting-unable-to-power-on-vm.pot | 17 ++-
.../troubleshooting-working-with-server-logs.pot | 17 ++-
docs/pot/troubleshooting.pot | 17 ++-
.../troublesht-dataloss-on-exp-primary-storage.pot | 17 ++-
.../troublesht-mtn-mode-not-working-on-vCenter.pot | 17 ++-
docs/pot/tuning.pot | 17 ++-
docs/pot/ui.pot | 17 ++-
...pgrade-virtual-router-with-service-offering.pot | 17 ++-
docs/pot/upload-existing-volume-to-vm.pot | 17 ++-
docs/pot/upload-template.pot | 17 ++-
docs/pot/usage-record-format.pot | 17 ++-
docs/pot/usage-types.pot | 17 ++-
docs/pot/use-project-view.pot | 17 ++-
docs/pot/user-data-and-meta-data.pot | 17 ++-
docs/pot/user-services-overview.pot | 17 ++-
docs/pot/using-multiple-guest-networks.pot | 17 ++-
docs/pot/using-netscaler-load-balancers.pot | 17 ++-
docs/pot/using-sshkeys.pot | 17 ++-
docs/pot/using-swift-for-secondary-storage.pot | 17 ++-
docs/pot/using-vpn-with-mac.pot | 17 ++-
docs/pot/using-vpn-with-windows.pot | 17 ++-
docs/pot/vcenter-maintenance-mode.pot | 17 ++-
docs/pot/verifying-source.pot | 17 ++-
docs/pot/virtual-machine-usage-record-format.pot | 17 ++-
docs/pot/virtual-machines.pot | 17 ++-
docs/pot/virtual-router.pot | 17 ++-
docs/pot/vlan-allocation-eg.pot | 17 ++-
docs/pot/vlan-provisioning.pot | 17 ++-
docs/pot/vm-lifecycle.pot | 17 ++-
docs/pot/vm-storage-migration.pot | 17 ++-
docs/pot/vmware-install.pot | 17 ++-
docs/pot/vmware-requirements.pot | 17 ++-
docs/pot/vmware-topology-req.pot | 17 ++-
docs/pot/volume-deletion-garbage-collection.pot | 17 ++-
docs/pot/volume-status.pot | 17 ++-
docs/pot/vpc.pot | 17 ++-
docs/pot/vpn.pot | 17 ++-
docs/pot/whatis.pot | 17 ++-
docs/pot/whats-in-this-adminguide.pot | 17 ++-
docs/pot/whats-new.pot | 17 ++-
docs/pot/who-should-read-installation.pot | 17 ++-
docs/pot/windows-installation.pot | 17 ++-
docs/pot/work-with-usage.pot | 17 ++-
docs/pot/working-with-hosts.pot | 17 ++-
docs/pot/working-with-iso.pot | 17 ++-
docs/pot/working-with-snapshots.pot | 17 ++-
docs/pot/working-with-system-vm.pot | 17 ++-
docs/pot/working-with-templates.pot | 17 ++-
docs/pot/working-with-usage-data.pot | 17 ++-
docs/pot/working-with-volumes.pot | 17 ++-
docs/pot/xenserver-maintenance-mode.pot | 17 ++-
docs/pot/xenserver-topology-req.pot | 17 ++-
docs/pot/zone-add.pot | 17 ++-
.../debian/config/etc/init.d/cloud-early-config | 58 +++-----
patches/systemvm/debian/config/root/edithosts.sh | 15 +--
.../xen/resource/CitrixResourceBase.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 76 ++++++++--
server/src/com/cloud/network/NetworkModelImpl.java | 36 +++++
.../src/com/cloud/network/NetworkServiceImpl.java | 36 +-----
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 +-
.../com/cloud/server/ConfigurationServerImpl.java | 16 +-
.../com/cloud/network/MockNetworkModelImpl.java | 9 ++
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 7 +
setup/bindir/cloud-setup-databases.in | 4 +-
setup/db/4.1-new-db-schema.sql | 2 +
setup/db/db/schema-40to410.sql | 8 +-
.../definitions/systemvmtemplate/cleanup.sh | 2 -
.../systemvmtemplate/cloudstack-packages.sh | 74 +++++++++-
.../definitions/systemvmtemplate/definition.rb | 2 +-
.../definitions/systemvmtemplate/preseed.cfg | 10 +-
.../definitions/systemvmtemplate/zerodisk.sh | 3 +
usage/pom.xml | 61 ++++++++
utils/src/com/cloud/utils/PropertiesUtil.java | 8 +-
.../cloud/utils/component/ComponentContext.java | 7 +-
494 files changed, 6942 insertions(+), 1600 deletions(-)
----------------------------------------------------------------------