Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' ... Conflicts: engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java		2013-10-23 12:31:53 -07:00
..
com/cloud	Merge remote-tracking branch 'origin/txn-refactor'	2013-10-23 10:40:44 -07:00
org/apache/cloudstack	Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'	2013-10-23 12:31:53 -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