You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/08 20:55:23 UTC
[2/43] git commit: Merge branch 'master' into vpc
Merge branch 'master' into vpc
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/048c5e50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/048c5e50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/048c5e50
Branch: refs/heads/vpc
Commit: 048c5e50cfe4e9a38589eef17756a3cb5ecc8800
Parents: b74a6a7 da26302
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Aug 8 11:50:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Aug 8 11:50:39 2012 -0700
----------------------------------------------------------------------
DISCLAIMER | 7 +
KEYS | 58 +
LICENSE | 207 ++
NOTICE | 8 +
.../com/cloud/network/element/NetworkElement.java | 3 +-
api/src/com/cloud/user/UserContext.java | 15 +-
awsapi/.classpath | 18 -
build/build-cloud.xml | 2 +-
build/developer.xml | 2 +-
docs/en-US/Book_Info.xml | 3 +-
docs/en-US/about-working-with-vms.xml | 6 +
docs/en-US/accessing-vms.xml | 6 +
docs/en-US/added-API-commands.xml | 7 +
docs/en-US/added-cloudPlatform-error-codes.xml | 6 +
docs/en-US/asynchronous-commands.xml | 6 +
docs/en-US/cloudstack_features.xml | 6 +
docs/en-US/cloudstack_system_requirements.xml | 6 +
docs/en-US/cloudstack_whatis.xml | 7 +
docs/en-US/deployment_architecture_overview.xml | 7 +
docs/en-US/developer-getting-started.xml | 7 +
docs/en-US/enable-disable-static-nat.xml | 23 +-
docs/en-US/enable-security-groups.xml | 21 +-
docs/en-US/enabling-api-call-expiration.xml | 24 +
docs/en-US/enabling-port-8096.xml | 24 +
docs/en-US/end-user-ui-overview.xml | 21 +-
docs/en-US/error-handling.xml | 25 +-
docs/en-US/event-log-queries.xml | 21 +-
docs/en-US/event-types.xml | 26 +-
docs/en-US/events-log.xml | 24 +-
docs/en-US/events.xml | 21 +-
docs/en-US/example-LDAP-configuration-commands.xml | 23 +-
.../example-response-from-listUsageRecords.xml | 26 +-
docs/en-US/export-template.xml | 23 +-
.../external-firewalls-and-load-balancers.xml | 27 +-
docs/en-US/feature-overview.xml | 25 +-
docs/en-US/firewall-rules.xml | 25 +-
docs/en-US/first_ms_node_install.xml | 30 +-
docs/en-US/globally-configured-limit.xml | 23 +-
docs/en-US/globally-configured-limits.xml | 23 +-
docs/en-US/guest-ip-ranges.xml | 21 +-
docs/en-US/guest-network.xml | 25 +-
docs/en-US/guest-traffic.xml | 21 +-
docs/en-US/ha-enabled-vm.xml | 25 +-
docs/en-US/ha-for-hosts.xml | 25 +-
docs/en-US/ha-management-server.xml | 23 +-
docs/en-US/host-add.xml | 23 +-
docs/en-US/host-allocation.xml | 29 +-
.../hypervisor-support-for-primarystorage.xml | 31 +-
docs/en-US/import-ami.xml | 27 +-
.../increase-management-server-max-memory.xml | 21 +-
docs/en-US/incremental-snapshots-backup.xml | 23 +-
...l-setup-of-external-firewalls-loadbalancers.xml | 23 +-
docs/en-US/initialize-and-test.xml | 23 +-
.../install-database-on-management-server-node.xml | 26 +-
docs/en-US/install-database-on-separate-node.xml | 23 +-
.../install-management-server-multi-nodes.xml | 28 +-
docs/en-US/install-management-server.xml | 35 +-
docs/en-US/installation-complete.xml | 21 +-
docs/en-US/installation-steps-overview.xml | 114 +-
docs/en-US/installation.xml | 21 +-
docs/en-US/installation_overview.xml | 21 +-
docs/en-US/installation_steps_overview.xml | 142 +-
docs/en-US/introduction.xml | 21 +-
docs/en-US/ip-forwarding-firewalling.xml | 21 +-
docs/en-US/ip-load-balancing.xml | 23 +-
docs/en-US/ipaddress-usage-record-format.xml | 49 +-
docs/en-US/isolated-networks.xml | 23 +-
docs/en-US/job-status.xml | 26 +-
docs/en-US/linux-installation.xml | 38 +-
docs/en-US/load-balancer-rules.xml | 27 +-
...cy-port-forwarding-rule-usage-record-format.xml | 49 +-
docs/en-US/log-in-root-admin.xml | 21 +-
docs/en-US/log-in.xml | 21 +-
docs/en-US/long-running-job-events.xml | 21 +-
docs/en-US/maintain-hypervisors-on-hosts.xml | 27 +-
.../en-US/maintenance-mode-for-primary-storage.xml | 23 +-
docs/en-US/making-api-request.xml | 32 +-
docs/en-US/manage-cloud.xml | 21 +-
docs/en-US/management-server-install-flow.xml | 21 +-
.../management-server-installation-overview.xml | 31 +-
docs/en-US/management-server-overview.xml | 61 +-
.../en-US/management_server_multi_node_install.xml | 21 +-
docs/en-US/management_server_overview.xml | 67 +-
docs/en-US/manual-live-migration.xml | 24 +
docs/en-US/max-result-page-returned.xml | 24 +
.../migrate-datadisk-volume-new-storage-pool.xml | 25 +-
...grate-vm-rootvolume-volume-new-storage-pool.xml | 25 +-
docs/en-US/minimum-system-requirements.xml | 30 +-
docs/en-US/modify-delete-service-offerings.xml | 21 +-
docs/en-US/multi_node_overview.xml | 24 +
docs/en-US/multiple-system-vm-vmware.xml | 23 +-
docs/en-US/release-notes-3.0.4.ent | 4 +
docs/publican-cloudstack/defaults.cfg | 6 +
docs/publican-cloudstack/overrides.cfg | 5 +
docs/publican-cloudstack/publican.cfg | 9 +
docs/runbook/zh-CN/Author_Group.po | 37 +
docs/runbook/zh-CN/Book_Info.po | 54 +
docs/runbook/zh-CN/Chapter.po | 65 +
docs/runbook/zh-CN/Environment.po | 494 +++
docs/runbook/zh-CN/Management.po | 235 ++
docs/runbook/zh-CN/Overview.po | 130 +
docs/runbook/zh-CN/Preface.po | 34 +
docs/runbook/zh-CN/Revision_History.po | 39 +
docs/runbook/zh-CN/Runbook.po | 27 +
docs/runbook/zh-CN/config.po | 280 ++
docs/runbook/zh-CN/kvm.po | 145 +
.../kvm/resource/LibvirtCapXMLParser.java | 14 +-
.../kvm/resource/LibvirtComputingResource.java | 12 +-
.../network/element/CiscoNexusVSMElement.java | 3 +-
.../element/ElasticLoadBalancerElement.java | 2 +-
.../element/F5ExternalLoadBalancerElement.java | 2 +-
.../element/JuniperSRXExternalFirewallElement.java | 2 +-
.../cloud/network/element/NetscalerElement.java | 15 +-
.../cloud/network/element/NiciraNvpElement.java | 5 +-
.../src/com/cloud/network/element/OvsElement.java | 3 +-
python/lib/cloudutils/syscfg.py | 2 +-
server/src/com/cloud/api/ApiServer.java | 6 +-
server/src/com/cloud/configuration/Config.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 13 +-
.../cloud/network/element/BareMetalElement.java | 3 +-
.../network/element/CloudZonesNetworkElement.java | 3 +-
.../cloud/network/element/ExternalDhcpElement.java | 3 +-
.../network/element/SecurityGroupElement.java | 3 +-
.../network/element/VirtualRouterElement.java | 15 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 794 ++--
server/src/com/cloud/user/AccountManagerImpl.java | 3 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 7 +-
setup/.classpath | 5 +
setup/db/db/schema-303to40.sql | 2 +-
.../src/com/cloud/sample/UserCloudAPIExecutor.java | 3 +-
.../cloud/test/stress/StressTestDirectAttach.java | 2788 +++++++-------
.../com/cloud/test/stress/TestClientWithAPI.java | 64 +-
test/src/com/cloud/test/utils/UtilsForTest.java | 392 +-
tools/devcloud/README | 26 +
tools/devcloud/devcloud.cfg | 91 +
ui/scripts/ui/widgets/detailView.js | 2 +-
ui/scripts/ui/widgets/multiEdit.js | 7 +
.../cloud/utils/component/ComponentLocator.java | 196 +-
.../cloud/utils/component/PluggableService.java | 3 +-
utils/src/com/cloud/utils/component/Plugin.java | 64 +
utils/src/com/cloud/utils/encoding/Base64.java | 1739 ---------
.../utils/component/MockComponentLocator.java | 4 +-
142 files changed, 6038 insertions(+), 4277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/api/src/com/cloud/network/element/NetworkElement.java
----------------------------------------------------------------------