incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [1/22] git commit: Merge branch 'master' into vpc
Date Mon, 16 Jul 2012 22:44:06 GMT
Updated Branches:
  refs/heads/master 8a3a788d7 -> 097c26069
  refs/heads/vpc 4a7149e6b -> 7c2b123d9


Merge branch 'master' into vpc


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

Branch: refs/heads/vpc
Commit: 7c2b123d94a1095dfbff0c7f797143cc4271f155
Parents: 47615a2 097c260
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Mon Jul 16 15:43:16 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Mon Jul 16 15:43:16 2012 -0700

----------------------------------------------------------------------
 README.md                                          |    7 +-
 build/build-marvin.xml                             |   12 +
 build/build-tests.xml                              |   27 +-
 build/build-usage.xml                              |   19 +-
 build/simulator.properties                         |   11 +
 docs/configs/Author_Group/Apache/Author_Group.xml  |   35 +
 .../configs/Book_Info/Main_Book_Info/Book_Info.xml |   27 +
 docs/configs/Legal_Notice/Legal_Notice.xml         |   35 +
 docs/configs/main/README.txt                       |    5 +
 docs/en-US/Author_Group.xml                        |   26 +
 docs/en-US/Book_Info.xml                           |   27 +
 docs/en-US/Common_Content/Legal_Notice.xml         |    7 +
 docs/en-US/LDAPserver-for-user-authentication.xml  |   21 +
 docs/en-US/Preface.xml                             |   13 +
 docs/en-US/Revision_History.xml                    |   27 +
 docs/en-US/SSL-keystore-path-and-password.xml      |   10 +
 docs/en-US/VPN-user-usage-record-format.xml        |   17 +
 docs/en-US/about-pods.xml                          |    9 +
 docs/en-US/about-virtual-networks.xml              |   12 +
 docs/en-US/about-working-with-vms.xml              |   15 +
 docs/en-US/accept-membership-invite.xml            |   17 +
 docs/en-US/accessing-vms.xml                       |   17 +
 docs/en-US/accounts-users-domains.xml              |   35 +
 docs/en-US/accounts.xml                            |    9 +
 docs/en-US/acquire-new-ip-address.xml              |   17 +
 docs/en-US/add-additional-guest-network.xml        |   25 +
 docs/en-US/add-ingress-egress-rules.xml            |   73 +
 docs/en-US/add-iso.xml                             |   74 +
 docs/en-US/add-load-balancer-rule.xml              |   27 +
 docs/en-US/add-members-to-projects.xml             |   14 +
 .../en-US/add-password-management-to-templates.xml |   14 +
 docs/en-US/add-projects-members-from-ui.xml        |   18 +
 docs/en-US/add-security-group.xml                  |   20 +
 docs/en-US/added-API-commands.xml                  |  143 +
 docs/en-US/added-cloudPlatform-error-codes.xml     |  114 +
 .../adding-IP-addresses-for-the-public-network.xml |   26 +
 docs/en-US/admin-alerts.xml                        |   17 +
 docs/en-US/admin-guide.xml                         |   73 +
 docs/en-US/advanced-zone-configuration.xml         |    9 +
 ...dvanced-zone-physical-network-configuration.xml |   10 +
 docs/en-US/alerts.xml                              |   31 +
 docs/en-US/allocators.xml                          |    9 +
 docs/en-US/api-reference.xml                       |    8 +
 docs/en-US/appendix-a-time-zones.xml               |  124 +
 docs/en-US/asynchronous-commands-example.xml       |   88 +
 docs/en-US/asynchronous-commands.xml               |   15 +
 docs/en-US/attach-iso-to-vm.xml                    |   20 +
 docs/en-US/attaching-volume.xml                    |   25 +
 .../automatic-snapshot-creation-retention.xml      |   18 +
 docs/en-US/basic-zone-configuration.xml            |  128 +
 .../basic-zone-physical-network-configuration.xml  |   10 +
 docs/en-US/best-practices-for-vms.xml              |    6 +
 docs/en-US/best-practices-primary-storage.xml      |   13 +
 docs/en-US/best-practices-secondary-storage.xml    |   14 +
 docs/en-US/best-practices-templates.xml            |    9 +
 docs/en-US/best-practices-virtual-router.xml       |   15 +
 ...change-console-proxy-ssl-certificate-domain.xml |   30 +
 docs/en-US/change-host-password.xml                |   20 +
 .../change-network-offering-on-guest-network.xml   |   26 +
 docs/en-US/change-to-behavior-of-list-commands.xml |   70 +
 docs/en-US/changing-root-password.xml              |   32 +
 docs/en-US/changing-secondary-storage-ip.xml       |   26 +
 docs/en-US/changing-secondary-storage-servers.xml  |   17 +
 docs/en-US/changing-secondary-storage-serversp.xml |   17 +
 docs/en-US/changing-service-offering-for-vm.xml    |   30 +
 docs/en-US/changing-vm-name-os-group.xml           |   36 +
 docs/en-US/cloud-infrastructure-concepts.xml       |    9 +
 docs/en-US/cloud-infrastructure-overview.xml       |   28 +
 docs/en-US/cloud_infrastructure_overview.xml       |   21 +
 docs/en-US/cloudplatform-api.xml                   |   12 +
 docs/en-US/cloudstack-admin.xml                    |   12 +
 docs/en-US/cloudstack.ent                          |    4 +
 docs/en-US/cloudstack.xml                          |   16 +
 docs/en-US/cloudstack_admin.xml                    |   12 +
 docs/en-US/cloudstack_developers.xml               |   12 +
 docs/en-US/cloudstack_features.xml                 |   42 +
 docs/en-US/cloudstack_installation.xml             |   12 +
 docs/en-US/cloudstack_system_requirements.xml      |   45 +
 docs/en-US/cloudstack_trial_installation.xml       |   12 +
 docs/en-US/cloudstack_whatis.xml                   |   25 +
 docs/en-US/cluster-add.xml                         |    9 +
 docs/en-US/compatibility-matrix.xml                |   97 +
 docs/en-US/compute-disk-service-offerings.xml      |   29 +
 docs/en-US/concepts.xml                            |   11 +
 .../configure-guest-traffic-in-advanced-zone.xml   |   31 +
 ...onfigure-public-traffic-in-an-advanced-zone.xml |   10 +
 docs/en-US/configure-usage-server.xml              |   82 +
 docs/en-US/configure-virtual-router.xml            |   17 +
 docs/en-US/configure-vpn.xml                       |   33 +
 docs/en-US/configure-xenserver-dom-memory.xml      |   10 +
 docs/en-US/configure-xenserver-dom0-memory.xml     |   10 +
 docs/en-US/configuring-projects.xml                |   10 +
 docs/en-US/console-proxy.xml                       |   16 +
 docs/en-US/contacting-support.xml                  |    5 +
 docs/en-US/convert-hyperv-vm-to-template.xml       |   50 +
 docs/en-US/create-bare-metal-template.xml          |   31 +
 docs/en-US/create-new-projects.xml                 |   19 +
 docs/en-US/create-template-from-existing-vm.xml    |   38 +
 docs/en-US/create-template-from-snapshot.xml       |   11 +
 docs/en-US/create-templates-overview.xml           |   17 +
 docs/en-US/create-windows-template.xml             |   19 +
 docs/en-US/creating-compute-offerings.xml          |   33 +
 docs/en-US/creating-disk-offerings.xml             |   27 +
 docs/en-US/creating-network-offerings.xml          |  112 +
 docs/en-US/creating-new-volumes.xml                |   23 +
 docs/en-US/creating-system-service-offerings.xml   |   34 +
 docs/en-US/creating-vms.xml                        |   31 +
 docs/en-US/customizing-dns.xml                     |   26 +
 docs/en-US/dates-in-usage-record.xml               |    8 +
 docs/en-US/dedicated-ha-hosts.xml                  |   15 +
 docs/en-US/default-account-resource-limit.xml      |   22 +
 docs/en-US/default-template.xml                    |   37 +
 docs/en-US/delete-templates.xml                    |   10 +
 docs/en-US/deleting-vms.xml                        |   23 +
 docs/en-US/deployment-architecture-overview.xml    |   25 +
 docs/en-US/deployment_architecture_overview.xml    |   22 +
 docs/en-US/detach-move-volumes.xml                 |   25 +
 docs/en-US/developer-getting-started.xml           |   13 +
 docs/en-US/developer-guide.xml                     |   20 +
 docs/en-US/developer-introduction.xml              |   11 +
 docs/en-US/developer_guide.xml                     |   20 +
 docs/en-US/disable-enable-zones-pods-clusters.xml  |   34 +
 docs/en-US/disk-volume-usage-record-format.xml     |   21 +
 docs/en-US/dns-dhcp.xml                            |    9 +
 docs/en-US/domains.xml                             |   10 +
 docs/en-US/enable-disable-static-nat.xml           |   25 +
 docs/en-US/enable-security-groups.xml              |   10 +
 docs/en-US/enabling-api-call-expiration.xml        |   16 +
 docs/en-US/enabling-port-8096.xml                  |   13 +
 docs/en-US/end-user-ui-overview.xml                |    9 +
 docs/en-US/error-handling.xml                      |    6 +
 docs/en-US/event-log-queries.xml                   |   18 +
 docs/en-US/event-types.xml                         |  196 ++
 docs/en-US/events-log.xml                          |   10 +
 docs/en-US/events.xml                              |   11 +
 docs/en-US/example-LDAP-configuration-commands.xml |   28 +
 .../example-response-from-listUsageRecords.xml     |   32 +
 docs/en-US/export-template.xml                     |   10 +
 .../external-firewalls-and-load-balancers.xml      |   11 +
 docs/en-US/feature-overview.xml                    |   49 +
 docs/en-US/firewall-rules.xml                      |   37 +
 docs/en-US/first_ms_node_install.xml               |   34 +
 docs/en-US/globally-configured-limit.xml           |   81 +
 docs/en-US/globally-configured-limits.xml          |   81 +
 docs/en-US/guest-ip-ranges.xml                     |    9 +
 docs/en-US/guest-network.xml                       |   10 +
 docs/en-US/guest-traffic.xml                       |   19 +
 docs/en-US/ha-enabled-vm.xml                       |   10 +
 docs/en-US/ha-for-hosts.xml                        |   10 +
 docs/en-US/ha-management-server.xml                |   11 +
 docs/en-US/host-add.xml                            |    9 +
 docs/en-US/host-allocation.xml                     |   12 +
 .../hypervisor-support-for-primarystorage.xml      |   83 +
 docs/en-US/images/1000-foot-view.png               |  Bin 0 -> 222230 bytes
 docs/en-US/images/attach-disk-icon.png             |  Bin 0 -> 1092 bytes
 docs/en-US/images/basic-deployment.png             |  Bin 0 -> 5892 bytes
 docs/en-US/images/change-password.png              |  Bin 0 -> 891 bytes
 docs/en-US/images/change-service-icon.png          |  Bin 0 -> 769 bytes
 docs/en-US/images/destroy-instance.png             |  Bin 0 -> 815 bytes
 docs/en-US/images/detach-disk-icon.png             |  Bin 0 -> 953 bytes
 docs/en-US/images/edit-icon.png                    |  Bin 0 -> 940 bytes
 docs/en-US/images/http-access.png                  |  Bin 0 -> 10214 bytes
 docs/en-US/images/infrastructure-overview.png      |  Bin 0 -> 11852 bytes
 docs/en-US/images/installation-complete.png        |  Bin 0 -> 20814 bytes
 docs/en-US/images/migrate-instance.png             |  Bin 0 -> 837 bytes
 docs/en-US/images/provisioning-overview.png        |  Bin 0 -> 23622 bytes
 docs/en-US/images/release-ip-icon.png              |  Bin 0 -> 815 bytes
 docs/en-US/images/stop-instance-icon.png           |  Bin 0 -> 955 bytes
 docs/en-US/import-ami.xml                          |   93 +
 .../increase-management-server-max-memory.xml      |   16 +
 docs/en-US/incremental-snapshots-backup.xml        |   32 +
 ...l-setup-of-external-firewalls-loadbalancers.xml |   19 +
 docs/en-US/initialize-and-test.xml                 |    9 +
 .../install-database-on-management-server-node.xml |   82 +
 docs/en-US/install-database-on-separate-node.xml   |   86 +
 .../install-management-server-multi-nodes.xml      |   54 +
 docs/en-US/install-management-server.xml           |   41 +
 docs/en-US/installation-complete.xml               |   20 +
 docs/en-US/installation-steps-overview.xml         |   64 +
 docs/en-US/installation.xml                        |   12 +
 docs/en-US/installation_overview.xml               |   14 +
 docs/en-US/installation_steps_overview.xml         |   60 +
 docs/en-US/introduction.xml                        |   11 +
 docs/en-US/ip-forwarding-firewalling.xml           |   11 +
 docs/en-US/ip-load-balancing.xml                   |   15 +
 docs/en-US/ipaddress-usage-record-format.xml       |   19 +
 docs/en-US/isolated-networks.xml                   |   16 +
 docs/en-US/job-status.xml                          |   10 +
 docs/en-US/linux-installation.xml                  |   35 +
 docs/en-US/load-balancer-rules.xml                 |   10 +
 ...cy-port-forwarding-rule-usage-record-format.xml |   17 +
 docs/en-US/log-in-root-admin.xml                   |   27 +
 docs/en-US/log-in.xml                              |   29 +
 docs/en-US/long-running-job-events.xml             |   22 +
 docs/en-US/maintain-hypervisors-on-hosts.xml       |   11 +
 .../en-US/maintenance-mode-for-primary-storage.xml |    9 +
 docs/en-US/making-api-request.xml                  |   36 +
 docs/en-US/manage-cloud.xml                        |   12 +
 docs/en-US/management-server-install-flow.xml      |   17 +
 .../management-server-installation-overview.xml    |   24 +
 docs/en-US/management-server-overview.xml          |   57 +
 .../en-US/management_server_multi_node_install.xml |   11 +
 docs/en-US/management_server_overview.xml          |   52 +
 docs/en-US/manual-live-migration.xml               |   28 +
 docs/en-US/max-result-page-returned.xml            |   14 +
 .../migrate-datadisk-volume-new-storage-pool.xml   |   16 +
 ...grate-vm-rootvolume-volume-new-storage-pool.xml |   18 +
 docs/en-US/minimum-system-requirements.xml         |   60 +
 docs/en-US/modify-delete-service-offerings.xml     |   10 +
 docs/en-US/multi_node_overview.xml                 |   19 +
 docs/en-US/multiple-system-vm-vmware.xml           |    9 +
 .../en-US/network-offering-usage-record-format.xml |   20 +
 docs/en-US/network-offerings.xml                   |   28 +
 docs/en-US/network-service-providers.xml           |   17 +
 docs/en-US/network-usage-record-format.xml         |   17 +
 docs/en-US/networking-in-a-pod.xml                 |   23 +
 docs/en-US/networking-in-a-zone.xml                |   18 +
 docs/en-US/networking-overview.xml                 |   17 +
 docs/en-US/networking_overview.xml                 |   12 +
 docs/en-US/nfs-shares-on-management-server.xml     |   95 +
 docs/en-US/nfs-shares-on-separate-server.xml       |   28 +
 ...guration-of-external-firewalls-loadbalancer.xml |   15 +
 .../over-provisioning-service-offering-limits.xml  |   12 +
 docs/en-US/per-domain-limits.xml                   |   21 +
 docs/en-US/performance-monitoring.xml              |   10 +
 docs/en-US/pod-add.xml                             |    9 +
 docs/en-US/port-forwarding.xml                     |   33 +
 docs/en-US/prepare-nfs-shares.xml                  |   21 +
 docs/en-US/prepare-os.xml                          |   86 +
 docs/en-US/prepare-system-vm-template.xml          |   37 +
 docs/en-US/prepare_os.xml                          |   84 +
 docs/en-US/primary-storage-add.xml                 |    9 +
 .../en-US/primary-storage-outage-and-data-loss.xml |    9 +
 docs/en-US/primary-storage.xml                     |   10 +
 docs/en-US/private-public-template.xml             |   12 +
 docs/en-US/projects.xml                            |   13 +
 docs/en-US/provisioning-auth-api.xml               |   10 +
 docs/en-US/provisioning-steps-overview.xml         |   27 +
 docs/en-US/provisioning-steps.xml                  |   18 +
 docs/en-US/provisioning.xml                        |   10 +
 docs/en-US/query-filter.xml                        |   42 +
 docs/en-US/release-ip-address.xml                  |   22 +
 docs/en-US/release-notes-3.0.4.xml                 | 2420 +++++++++++++++
 docs/en-US/remove-member-from-project.xml          |   25 +
 docs/en-US/removed-API-commands.xml                |    8 +
 docs/en-US/removing-vsphere-hosts.xml              |    9 +
 docs/en-US/removing-xenserver-kvm-hosts.xml        |   15 +
 docs/en-US/requirements-templates.xml              |   12 +
 docs/en-US/resizing-volumes.xml                    |   19 +
 docs/en-US/response-formats.xml                    |   32 +
 docs/en-US/responses.xml                           |   11 +
 docs/en-US/roles.xml                               |   16 +
 docs/en-US/root-admin-ui-overview.xml              |    9 +
 ...untime-allocation-virtual-network-resources.xml |    9 +
 docs/en-US/runtime-behavior-of-primary-storage.xml |   12 +
 ...cheduled-maintenance-maintenance-mode-hosts.xml |    9 +
 docs/en-US/search-base.xml                         |   32 +
 docs/en-US/search-user-bind-dn.xml                 |   28 +
 docs/en-US/secondary-storage-add.xml               |    9 +
 .../secondary-storage-outage-and-data-loss.xml     |   10 +
 docs/en-US/secondary-storage-vm.xml                |   14 +
 docs/en-US/secondary-storage.xml                   |   10 +
 docs/en-US/security-groups.xml                     |   10 +
 docs/en-US/send-projects-membership-invitation.xml |   24 +
 docs/en-US/service-offerings.xml                   |   12 +
 docs/en-US/set-database-buffer-pool-size.xml       |   17 +
 .../en-US/set-monitor-total-vm-limits-per-host.xml |   10 +
 docs/en-US/set-projects-creator-permissions.xml    |   30 +
 docs/en-US/set-resource-limits-for-projects.xml    |   10 +
 docs/en-US/set-up-invitations.xml                  |   79 +
 docs/en-US/set-up-network-for-users.xml            |   17 +
 docs/en-US/set-usage-limit.xml                     |   14 +
 docs/en-US/shared-networks.xml                     |   18 +
 docs/en-US/signing-api-requests.xml                |   36 +
 docs/en-US/site-to-site-vpn.xml                    |   27 +
 docs/en-US/snapshot-restore.xml                    |    9 +
 docs/en-US/standard-events.xml                     |   22 +
 docs/en-US/static-nat.xml                          |    9 +
 .../en-US/sticky-session-policies-for-lb-rules.xml |   11 +
 docs/en-US/stop-restart-management-server.xml      |   16 +
 docs/en-US/stopped-vm.xml                          |   12 +
 docs/en-US/stopping-and-starting-vms.xml           |    5 +
 docs/en-US/storage-tags.xml                        |   11 +
 docs/en-US/storage.xml                             |   11 +
 docs/en-US/suspend-project.xml                     |   30 +
 docs/en-US/sys-reliability-and-ha.xml              |   12 +
 docs/en-US/sysprep-for-windows-server-2003R2.xml   |   39 +
 docs/en-US/sysprep-windows-server-2008R2.xml       |   51 +
 docs/en-US/system-service-offerings.xml            |   10 +
 docs/en-US/system-vm-template.xml                  |   19 +
 .../template-iso-snapshot-usage-record-format.xml  |   18 +
 docs/en-US/templates.xml                           |   10 +
 docs/en-US/time-zones.xml                          |  114 +
 docs/en-US/trial-installation.xml                  |   10 +
 docs/en-US/troubleshooting-alerts.xml              |   39 +
 ...ooting-dataloss-on-exported-primary-storage.xml |   30 +
 docs/en-US/troubleshooting-lb-rules-fails.xml      |   22 +
 ...ing-maintenance-mode-not-working-on-vCenter.xml |   26 +
 ...troubleshooting-recover-lost-virtual-router.xml |   31 +
 .../en-US/troubleshooting-unable-to-deploy-vms.xml |   21 +
 .../troubleshooting-unable-to-power-on-vm.xml      |   27 +
 .../troubleshooting-working-with-server-logs.xml   |   23 +
 docs/en-US/troubleshooting.xml                     |   18 +
 docs/en-US/tuning.xml                              |   15 +
 docs/en-US/ui.xml                                  |    9 +
 ...pgrade-virtual-router-with-service-offering.xml |   15 +
 docs/en-US/upload-existing-volume-to-vm.xml        |   57 +
 docs/en-US/upload-template.xml                     |   44 +
 docs/en-US/usage-record-format.xml                 |   17 +
 docs/en-US/usage-types.xml                         |  101 +
 docs/en-US/use-project-view.xml                    |   23 +
 docs/en-US/user-data-and-meta-data.xml             |   25 +
 docs/en-US/user-services-overview.xml              |   77 +
 docs/en-US/using-multiple-guest-networks.xml       |   12 +
 docs/en-US/using-netscaler-load-balancers.xml      |   42 +
 docs/en-US/using-sshkeys.xml                       |   87 +
 docs/en-US/using-swift-for-secondary-storage.xml   |   11 +
 docs/en-US/using-vpn-with-mac.xml                  |    9 +
 docs/en-US/using-vpn-with-windows.xml              |   23 +
 docs/en-US/vcenter-maintenance-mode.xml            |   23 +
 docs/en-US/virtual-machine-usage-record-format.xml |   22 +
 docs/en-US/virtual-router.xml                      |   10 +
 docs/en-US/vlan-provisioning.xml                   |   11 +
 docs/en-US/vm-lifecycle.xml                        |   20 +
 docs/en-US/vm-storage-migration.xml                |   15 +
 docs/en-US/volume-deletion-garbage-collection.xml  |   17 +
 docs/en-US/volume-status.xml                       |   10 +
 docs/en-US/vpc.xml                                 |   25 +
 docs/en-US/vpn.xml                                 |   22 +
 docs/en-US/whatis.xml                              |   26 +
 docs/en-US/whats-in-this-adminguide.xml            |    7 +
 docs/en-US/whats-new.xml                           |   15 +
 docs/en-US/who-should-read-installation.xml        |   15 +
 docs/en-US/windows-installation.xml                |    9 +
 docs/en-US/work-with-usage.xml                     |    9 +
 docs/en-US/working-with-hosts.xml                  |    9 +
 docs/en-US/working-with-iso.xml                    |   14 +
 docs/en-US/working-with-snapshots.xml              |   15 +
 docs/en-US/working-with-system-vm.xml              |    9 +
 docs/en-US/working-with-templates.xml              |   25 +
 docs/en-US/working-with-usage-data.xml             |   15 +
 docs/en-US/working-with-volumes.xml                |   12 +
 docs/en-US/xenserver-maintenance-mode.xml          |   33 +
 docs/en-US/zone-add.xml                            |   58 +
 .../manager/allocator/impl/FirstFitAllocator.java  |    6 +
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |    6 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |    5 +-
 tools/marvin/marvin/sandbox/README.txt             |   15 +-
 .../marvin/sandbox/demo/simulator/simulator.cfg    |  159 +
 tools/marvin/marvin/sandbox/run-marvin.sh          |   66 +
 tools/marvin/marvin/sandbox/testSetupSuccess.py    |   81 +
 351 files changed, 11250 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c2b123d/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------


Mime
View raw message