Min Chen a224287403 Merge branch 'master' into vim51_win8 ...

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>

2013-02-05 10:05:39 -08:00

..

XenServerJava

Removed all the .project files

2013-01-08 14:11:00 -08:00

install-non-oss.sh

Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP.

2013-01-31 10:32:05 -08:00