Updated Branches: refs/heads/master 3db9736a0 -> f57f96f7b
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/f57f96f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f57f96f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f57f96f7 Branch: refs/heads/master Commit: f57f96f7b755d6e5d4e535d8f011b4efddb3a841 Parents: e73d433 3db9736 Author: Prachi Damle <[email protected]> Authored: Thu Sep 6 11:23:50 2012 -0700 Committer: Prachi Damle <[email protected]> Committed: Thu Sep 6 11:23:50 2012 -0700 ---------------------------------------------------------------------- LICENSE | 41 +- .../com/cloud/agent/vmdata/JettyVmDataServer.java | 370 --------- api/src/com/cloud/storage/GuestOsCategory.java | 2 + awsapi/pom.xml | 5 + .../com/cloud/bridge/io/S3CAStorBucketAdapter.java | 479 +++++++++++ awsapi/src/com/cloud/bridge/model/SHost.java | 4 +- .../service/controller/s3/ServiceProvider.java | 23 +- .../com/cloud/bridge/service/core/s3/S3Engine.java | 6 + build/build-cloud-plugins.xml | 12 +- build/build-cloud.xml | 2 +- client/pom.xml | 42 +- client/tomcatconf/components.xml.in | 21 +- cloud.spec | 76 +- console-proxy/pom.xml | 111 +++ console-proxy/systemvm-descriptor.xml | 94 +++ .../virtualnetwork/VirtualRoutingResource.java | 141 +++- deps/install-non-oss.sh | 1 - deps/pom.xml | 35 +- docs/en-US/about-physical-networks.xml | 1 + docs/en-US/advanced-zone-configuration.xml | 156 ++++- docs/en-US/cloud-infrastructure-concepts.xml | 1 + docs/en-US/initialize-and-test.xml | 27 +- patches/cloudpatch-descriptor.xml | 43 + patches/pom.xml | 92 ++ patches/systemvm/debian/buildsystemvm.sh | 4 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 16 +- .../iptables_1.4.8-3local1checksum1_i386.deb | Bin 340494 -> 0 bytes .../debian/xe-guest-utilities_5.6.0-595_i386.deb | Bin 55452 -> 0 bytes patches/systemvm/debian/xt_CHECKSUM.ko | Bin 145696 -> 0 bytes plugins/hypervisors/kvm/pom.xml | 6 + .../kvm/resource/FakeComputingResource.java | 641 --------------- .../hypervisor/kvm/resource/KVMGuestOsMapper.java | 1 + .../kvm/resource/LibvirtComputingResource.java | 232 +++++- .../xen/resource/CitrixResourceBase.java | 2 +- plugins/pom.xml | 1 + pom.xml | 2 +- .../cloud/api/response/ApiResponseSerializer.java | 2 +- server/src/com/cloud/network/NetworkManager.java | 2 +- .../src/com/cloud/network/NetworkManagerImpl.java | 16 +- .../router/VirtualNetworkApplianceManagerImpl.java | 40 +- .../com/cloud/resource/ResourceManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 15 +- .../com/cloud/network/MockNetworkManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +- setup/bindir/cloud-setup-databases.in | 2 +- setup/db/db/schema-302to40.sql | 2 + setup/db/templates.sql | 2 +- tools/build/addcopyright.py | 300 ------- tools/build/build_asf.sh | 105 +++ tools/whisker/descriptor.xml | 32 +- ui/scripts/system.js | 11 +- version-info.in | 1 - wscript | 1 + wscript_build | 8 +- wscript_configure | 11 + 55 files changed, 1704 insertions(+), 1542 deletions(-) ----------------------------------------------------------------------
