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
..
installer	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00
network	Merge branch 'master' into vpc	2012-08-03 14:30:54 -07:00
storage	Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).	2012-08-10 13:33:06 -07:00
util	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00
vm	Merge branch 'master' into vpc	2012-07-31 13:37:28 -07:00
.classpath	License header updates for the scripts folder.	2012-08-03 09:38:28 -04:00
.project	License header updates for the scripts folder.	2012-08-03 09:38:28 -04:00
.pydevproject	License header updates for the scripts folder.	2012-08-03 09:38:28 -04:00