You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/18 00:32:02 UTC
[1/20] git commit: Merge branch 'master' into javelin
Updated Branches:
refs/heads/javelin 6eedfdfb7 -> 387c6fc13
Merge branch 'master' into javelin
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/387c6fc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/387c6fc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/387c6fc1
Branch: refs/heads/javelin
Commit: 387c6fc13581250d6f502bd8ea467837772d0da0
Parents: 6eedfdf 3a74c36
Author: Alex Huang <al...@citrix.com>
Authored: Mon Sep 17 15:31:37 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Mon Sep 17 15:31:37 2012 -0700
----------------------------------------------------------------------
README.html | 29 -
README.md | 120 +-
agent-simulator/db/create-schema-simulator.sql | 89 -
.../com/cloud/agent/manager/MockAgentManager.java | 40 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 703 ++++---
.../agent/manager/MockStorageManagerImpl.java | 1835 ++++++++++-----
.../com/cloud/agent/manager/MockVmManagerImpl.java | 307 ++-
.../cloud/agent/manager/SimulatorManagerImpl.java | 83 +-
.../cloud/simulator/SimulatorRuntimeException.java | 24 +
.../centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +-
.../fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +-
.../opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
.../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +-
agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
.../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 4 +-
awsapi/pom.xml | 10 +-
client/tomcatconf/db.properties.in | 12 +
cloud.spec | 6 +-
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 3 +-
pom.xml | 1 +
python/lib/cloudutils/utilities.py | 2 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 33 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 12 +-
.../src/com/cloud/upgrade/dao/Upgrade302to40.java | 349 +++
setup/db/create-database-simulator.sql | 29 +
setup/db/create-schema-simulator.sql | 26 +-
setup/db/deploy-db-simulator.sh | 4 +
.../sandbox/advanced/tests/test_scenarios.py | 145 --
utils/src/com/cloud/utils/db/Transaction.java | 53 +-
wscript_build | 2 +-
31 files changed, 2514 insertions(+), 1419 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/387c6fc1/awsapi/pom.xml
----------------------------------------------------------------------