Commit Graph

2 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
Harikrishna Patnala 68c80e28c0 CLOUDSTACK-6253: Optimizing VR alerts getting algorithm In addition to this a new configuration parameter is added router.alerts.check.interval defaulted to 30minutes to check for alerts in Virtual Router 2014-04-09 18:11:24 +05:30