Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc ... Conflicts: api/src/com/cloud/api/ApiConstants.java		2012-08-02 18:45:37 -07:00
..
src/com/cloud/hypervisor/kvm	Merge branch 'master' into vpc	2012-08-02 18:45:37 -07:00
test/com/cloud/hypervisor/kvm/resource	Another clean up for unnecessary parameter conn Clean up unused	2012-08-01 13:59:11 -07:00
.classpath	Move KVM related code into plugins/hypervisor/kvm, a new jar file is	2012-07-30 14:55:47 -07:00
.project	Move KVM related code into plugins/hypervisor/kvm, a new jar file is	2012-07-30 14:55:47 -07:00
.pydevproject	Move KVM related code into plugins/hypervisor/kvm, a new jar file is	2012-07-30 14:55:47 -07:00
build.xml	plugin: Rename cloud-kvm.jar to cloud-plugin-hypervisor-kvm.jar	2012-07-31 22:18:56 +02:00