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
..
acl/static-role-based	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
api	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
deployment-planners	Separate loadable components like Gurus, Elements, Adapters to componentContext.xml	2013-01-16 16:33:59 -08:00
event-bus/rabbitmq	Sync master to javelin one more time	2013-02-01 11:37:33 -08:00
file-systems/netapp	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
host-allocators/random	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
hypervisors	Merge branch 'master' into vim51_win8	2013-02-05 10:05:39 -08:00
network-elements	Merge javelin into master	2013-02-01 14:40:45 -08:00
parent	Removed all the .project files	2013-01-08 14:11:00 -08:00
storage	skip test in cloud engine	2013-01-22 13:25:48 -08:00
storage-allocators/random	Removed all the .project files	2013-01-08 14:11:00 -08:00
user-authenticators	Separate loadable components like Gurus, Elements, Adapters to componentContext.xml	2013-01-16 16:33:59 -08:00
pom.xml	Merge javelin into master	2013-02-01 14:40:45 -08:00