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

..

src/com/cloud

Merge branch 'master' into vpc

2012-08-11 18:27:18 -07:00

test/com/cloud

License header updates for the core folder from Chip Childers

2012-07-02 09:54:47 -04:00

.classpath

CS-15875 resolved via patch from Andy Gross.

2012-08-07 14:10:11 -04:00

.project

License header updates for the core folder

2012-08-02 09:22:36 -04:00