Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc ... Conflicts: utils/test/com/cloud/utils/component/MockComponentLocator.java		2012-08-08 11:50:39 -07:00
..
src/com/cloud	Merge branch 'master' into vpc	2012-08-08 11:50:39 -07:00
.classpath	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
.project	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
build.xml	moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware	2012-06-26 19:48:55 -07:00