Harikrishna Patnala a8ad908666 CLOUDSTACK-3703: change service offering of stopped vm on ... Conflicts: server/test/com/cloud/vm/UserVmManagerTest.java		2013-07-27 19:52:30 +05:30
..
com/cloud	CLOUDSTACK-3703: change service offering of stopped vm on	2013-07-27 19:52:30 +05:30
org/apache/cloudstack	Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine	2013-07-25 03:57:12 -07:00
resources	Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"	2013-07-21 22:23:48 -07:00
async-job-component.xml	CLOUDSTACK-1192: Add Disk I/O Statistics	2013-06-01 08:00:48 +02:00
sync-queue-component.xml	License header updates for the server folder.	2012-08-03 09:41:27 -04:00