Commit Graph

5 Commits

Author SHA1 Message Date
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
Wido den Hollander dcfa5a50b7 docs: Fix indentation according to coding convention
The coding convention requires:
* 4 spaces, no tabs
* Unix line endings
2012-08-11 22:43:26 +02:00
Joe Brockmeier 37c138840b fixing licenses for q,r files 2012-08-11 11:56:32 -07:00
Kelven Yang 3a6d890741 Commit for review-request: https://reviews.apache.org/r/6458/ 2012-08-08 17:18:31 -07:00
David Nalley e874fdb24c adding docs 2012-07-16 15:43:58 -04:00