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
..
deployment-planners	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
file-systems/netapp	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
host-allocators/random	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
hypervisors	Merge branch 'master' into vpc	2012-08-11 18:27:18 -07:00
network-elements	Merge branch 'master' into vpc	2012-08-08 11:50:39 -07:00
storage-allocators/random	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
user-authenticators	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00