cloudstack/plugins/hypervisors/xen
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
..
src/com/cloud Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
.classpath Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
.project Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
build.xml Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00