cloudstack/server/test
Min Chen 93f14e7c65 Merge branch 'master' into vim51_win8
Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
..
com/cloud Merge branch 'master' into vim51_win8 2013-02-27 17:47:10 -08:00
org/apache/cloudstack/region CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil. 2013-02-26 14:21:21 +05:30
resources From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001 2013-02-25 14:57:57 -08:00
async-job-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00