Updated Branches:
refs/heads/marvin-parallel f9145118c -> 04959a0dc
Merge branch 'master' into marvin-parallel
Conflicts:
tools/marvin/setup.py
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/04959a0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/04959a0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/04959a0d
Branch: refs/heads/marvin-parallel
Commit: 04959a0dc92afe5b864d8b199c47644a04447a41
Parents: f914511 802ddd4
Author: Prasanna Santhanam <[email protected]>
Authored: Mon Oct 29 20:40:02 2012 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Mon Oct 29 20:40:02 2012 +0530
----------------------------------------------------------------------
plugins/hypervisors/vmware/pom.xml | 3 -
.../src/com/cloud/network/NetworkManagerImpl.java | 9 +
setup/bindir/cloud-set-guest-password.in | 4 +-
test/integration/component/test_accounts.py | 6 +-
.../component/test_allocation_states.py | 6 +-
test/integration/component/test_blocker_bugs.py | 6 +-
test/integration/component/test_egress_rules.py | 6 +-
test/integration/component/test_eip_elb.py | 6 +-
.../integration/component/test_network_offering.py | 6 +-
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 6 +-
.../component/test_project_resources.py | 6 +-
test/integration/component/test_project_usage.py | 6 +-
test/integration/component/test_projects.py | 6 +-
test/integration/component/test_resource_limits.py | 6 +-
test/integration/component/test_routers.py | 6 +-
test/integration/component/test_security_groups.py | 6 +-
test/integration/component/test_snapshots.py | 6 +-
test/integration/component/test_templates.py | 6 +-
test/integration/component/test_usage.py | 6 +-
test/integration/component/test_volumes.py | 6 +-
test/integration/lib/__init__.py | 16 -
test/integration/lib/base.py | 2146 ---------------
test/integration/lib/common.py | 515 ----
test/integration/lib/utils.py | 179 --
test/integration/smoke/test_disk_offerings.py | 6 +-
test/integration/smoke/test_hosts.py | 6 +-
test/integration/smoke/test_iso.py | 6 +-
test/integration/smoke/test_network.py | 6 +-
test/integration/smoke/test_primary_storage.py | 8 +-
test/integration/smoke/test_routers.py | 6 +-
test/integration/smoke/test_secondary_storage.py | 7 +-
test/integration/smoke/test_service_offerings.py | 6 +-
test/integration/smoke/test_ssvm.py | 6 +-
test/integration/smoke/test_templates.py | 6 +-
test/integration/smoke/test_vm_life_cycle.py | 6 +-
test/integration/smoke/test_volumes.py | 6 +-
test/setup-test-data.sh | 12 +-
tools/devcloud/devcloud.sql | 3 +-
tools/marvin/marvin/deployDataCenter.py | 2 +-
tools/marvin/marvin/integration/__init__.py | 18 +
tools/marvin/marvin/integration/lib/__init__.py | 16 +
tools/marvin/marvin/integration/lib/base.py | 2146 +++++++++++++++
tools/marvin/marvin/integration/lib/common.py | 515 ++++
tools/marvin/marvin/integration/lib/utils.py | 179 ++
tools/marvin/marvin/marvinPlugin.py | 4 +-
tools/marvin/setup.py | 6 +-
vmware-base/pom.xml | 3 -
48 files changed, 2994 insertions(+), 2965 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/04959a0d/tools/marvin/setup.py
----------------------------------------------------------------------
