Alena Prokharchyk b61468d65c Merge branch 'master' into vpc ... Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java		2012-08-11 18:27:18 -07:00
..
conf	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src/com/cloud	Merge branch 'master' into vpc	2012-08-11 18:27:18 -07:00
test	Merge branch 'master' into vpc	2012-08-10 10:47:49 -07:00
.classpath	CS-15875 resolved via patch from Andy Gross.	2012-08-07 14:10:11 -04:00
.project	License header updates for the server folder.	2012-08-03 09:41:27 -04:00