Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2e393d2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2e393d2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2e393d2f Branch: refs/heads/junit-tests Commit: 2e393d2fe9c56cecdaf2f16b9b0c2c17dfaf864c Parents: 0b0d572 8f2afb9 Author: Prasanna Santhanam <[email protected]> Authored: Tue Sep 25 12:15:25 2012 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Tue Sep 25 12:15:25 2012 +0530 ---------------------------------------------------------------------- .gitignore | 9 +- awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt | 68 - .../docs/AmazonEC2/EC2-implementation-guide.html | 164 --- .../docs/AmazonEC2/EC2-local-deploy-using-ant.html | 92 -- awsapi/docs/AmazonEC2/EC2-users-guide.html | 275 ---- awsapi/docs/AmazonEC2/wsdl2java-command-line.txt | 21 - awsapi/docs/AmazonS3/S3-users-guide.html | 120 -- awsapi/docs/AmazonS3/notes.txt | 29 - awsapi/docs/AmazonS3/wsdl2java-command-line.txt | 66 - .../WEB-INF/classes/resources/messages.properties | 4 +- cloud-cli/cloudapis/cloud.py | 6 +- cloud.spec | 10 + debian/changelog | 6 + debian/cloud-scripts.postinst | 34 + debian/cloud-system-iso.postinst | 34 + developer/pom.xml | 174 +++ docs/en-US/add-load-balancer-rule.xml | 4 - docs/en-US/add-more-clusters.xml | 29 + docs/en-US/add-primary-storage.xml | 108 ++ docs/en-US/add-secondary-storage.xml | 48 + docs/en-US/aws-ec2-configuration.xml | 64 + docs/en-US/aws-ec2-introduction.xml | 47 + docs/en-US/aws-ec2-requirements.xml | 30 + docs/en-US/aws-ec2-supported-commands.xml | 407 ++++++ docs/en-US/aws-ec2-user-setup.xml | 91 ++ docs/en-US/aws-interface-guide.xml | 32 + docs/en-US/choosing_a_deployment_architecture.xml | 29 + docs/en-US/cloud-infrastructure-overview.xml | 2 +- docs/en-US/cloudstack_features.xml | 66 - docs/en-US/cloudstack_installation.ent | 22 + docs/en-US/cloudstack_system_requirements.xml | 68 - docs/en-US/cloudstack_whatis.xml | 39 - docs/en-US/configure-package-repository.xml | 46 + docs/en-US/create-vpn-connection-vpc.xml | 103 ++ docs/en-US/create-vpn-customer-gateway.xml | 191 +++ docs/en-US/create-vpn-gateway-for-vpc.xml | 80 ++ docs/en-US/installation.xml | 1 + docs/en-US/installation_overview.xml | 33 - docs/en-US/large_scale_redundant_setup.xml | 42 + .../en-US/management-server-install-prepare-os.xml | 2 +- docs/en-US/multi_node_management_server.xml | 36 + docs/en-US/multi_site_deployment.xml | 50 + docs/en-US/prepare_os.xml | 106 -- docs/en-US/primary-storage-add.xml | 50 +- docs/en-US/secondary-storage-add.xml | 22 +- docs/en-US/separate_storage_network.xml | 24 + docs/en-US/small_scale_deployment.xml | 37 + docs/publican-all.cfg | 1 + docs/publican-install.cfg | 4 +- .../debian/config/etc/httpd/conf/httpd.conf | 990 --------------- patches/systemvm/debian/config/etc/logrotate.conf | 12 - .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 +- .../root/redundant_router/keepalived.conf.templ | 24 - patches/systemvm/debian/vpn/etc/ipsec.conf | 43 +- patches/systemvm/debian/vpn/etc/ipsec.conf.orig | 48 - patches/systemvm/debian/vpn/etc/ipsec.secrets | 10 - patches/systemvm/debian/vpn/etc/ipsec.secrets.orig | 11 - .../debian/vpn/etc/xl2tpd/xl2tpd.conf.orig | 76 -- .../systemvm/debian/xe/xe-linux-distribution.init | 106 -- patches/systemvm/debian/xe/xen-vcpu-hotplug.rules | 1 - .../kvm/storage/LibvirtStorageAdaptor.java | 8 +- pom.xml | 45 +- scripts/vm/hypervisor/xenserver/vmops | 21 + .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +- setup/db/create-index-fk.sql | 2 + test/scripts/wget.exe | Bin 162816 -> 0 bytes tools/build/build_docs.sh | 55 + tools/guest_password/cloud-set-guest-password | 116 ++ ui/dictionary.jsp | 2 + ui/scripts/accounts.js | 170 ++- ui/scripts/domains.js | 188 ++- ui/scripts/system.js | 84 ++ ui/scripts/ui/widgets/detailView.js | 2 +- .../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 +- .../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 +- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 +- 76 files changed, 2451 insertions(+), 2692 deletions(-) ----------------------------------------------------------------------
