3 Commits

Author SHA1 Message Date
John Dilley
57ee142ded CLOUDSTACK-7190: Fix Hyper-V issue when attempting SSH to System VMs 2014-07-28 16:59:34 +05:30
SrikanteswaraRao Talluri
d22adf943d Merge branch 'marvin'
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/component/test_dynamic_compute_offering.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_disk_offerings.py
	test/integration/smoke/test_volumes.py
2014-04-23 11:45:43 +05:30
Harikrishna Patnala
ecc71518a9 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:12:20 +05:30