You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/06 23:25:51 UTC
[1/15] git commit: Merge branch 'master' into 4.0
Updated Branches:
refs/heads/4.0 ebfe12e84 -> bd5aebb2b
Merge branch 'master' into 4.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bd5aebb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bd5aebb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bd5aebb2
Branch: refs/heads/4.0
Commit: bd5aebb2bdbee958edff8be90303c094bb029352
Parents: ebfe12e f26929b
Author: Edison Su <su...@gmail.com>
Authored: Thu Sep 6 11:50:13 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Sep 6 11:50:13 2012 -0700
----------------------------------------------------------------------
LICENSE | 41 +-
awsapi/pom.xml | 5 +
awsapi/resource/AmazonEC2/AmazonEC2.wsdl | 4916 ---------------
awsapi/resource/AmazonEC2/services.xml | 16 +
.../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-aws-api.xml | 1 -
build/build-cloud-plugins.xml | 4 +-
client/pom.xml | 5 +
cloud.spec | 2 +
deps/install-non-oss.sh | 1 -
deps/pom.xml | 5 +
patches/systemvm/debian/buildsystemvm.sh | 4 +-
.../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 +
plugins/pom.xml | 1 +
.../router/VirtualNetworkApplianceManagerImpl.java | 40 +-
tools/whisker/descriptor.xml | 32 +-
wscript_build | 2 +-
23 files changed, 632 insertions(+), 4961 deletions(-)
----------------------------------------------------------------------