Merge branch 'bvt' into marvin-refactor
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c489e2a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c489e2a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c489e2a5
Branch: refs/heads/marvin-refactor
Commit: c489e2a54a37fd6f17b61d9bd2e7272d65737eed
Parents: 14c5369 6da933d
Author: Prasanna Santhanam <[email protected]>
Authored: Mon Mar 18 16:26:26 2013 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Mon Mar 18 16:26:26 2013 +0530
----------------------------------------------------------------------
client/pom.xml | 21 +-
client/tomcatconf/componentContext.xml.in | 6 +-
developer/pom.xml | 240 +++++++++------
plugins/pom.xml | 3 +-
pom.xml | 189 ++----------
test/integration/component/test_project_usage.py | 2 +-
test/integration/component/test_usage.py | 2 +-
test/integration/component/test_volumes.py | 2 +-
test/integration/smoke/test_iso.py | 4 +-
test/integration/smoke/test_nic.py | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 2 +-
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/TestCaseExecuteEngine.py | 9 +-
tools/marvin/marvin/deployAndRun.py | 38 +--
tools/marvin/marvin/remoteSSHClient.py | 9 +-
.../marvin/sandbox/demo/simulator/simulator.cfg | 4 +-
tools/marvin/pom.xml | 219 +++++++-------
tools/marvin/setup.py | 5 +-
18 files changed, 315 insertions(+), 443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c489e2a5/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c489e2a5/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
