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
..
baremetal	Sync javelin with master up to 894cb8f7d9	2013-01-31 17:20:19 -08:00
kvm	agent: Use FileInputStream for reading files instead of cat	2013-02-02 18:08:24 +01:00
ovm	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
simulator	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
ucs	ucs: Fix ucs plugin's pom, removes xml marktag	2013-02-02 09:16:17 -08:00
vmware	Merge branch 'master' into vim51_win8	2013-02-05 10:05:39 -08:00
xen	Sync javelin with master up to 894cb8f7d9	2013-01-31 17:20:19 -08:00