Commit Graph

3 Commits

Author SHA1 Message Date
SrikanteswaraRao Talluri 798a6aa2e3 Marvin + test changes from master Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 404ac549bf)

Conflicts:
	test/integration/smoke/test_vm_iam.py
	tools/marvin/marvin/deployDataCenter.py
	tools/marvin/marvin/lib/base.py
2014-07-28 17:40:56 +02:00
SrikanteswaraRao Talluri 65da24c35e CLOUDSTACK-4691: move egress rules host maintenance tests to maint folder
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 6b28e03d6d)
2013-09-30 15:12:20 +05:30
Prasanna Santhanam 0587d3a496 Moving maintenance mode into component/maint
All tests that could possible disrupt the runs of other tests because of
putting resources into maintenace will be put under maint/. This should
allow us to run the tests sequentially when other tests are not running
on a deployment.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-17 12:33:57 +05:30