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

..

hypervisor/vmware

Fix cast error from List<?> to array.

2013-02-05 21:44:38 -08:00

vmware

Merge branch 'master' into vim51_win8

2013-02-27 17:47:10 -08:00