cloudstack/plugins/hypervisors
Marcus Sorensen d8056c931e Merge branch 'master' into resizevolume
Fixing conflicts

Conflicts:
	api/src/com/cloud/exception/CloudException.java
	api/src/com/cloud/storage/StorageService.java
	api/src/com/cloud/storage/Volume.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/storage/StorageManagerImpl.java
	setup/db/create-schema-view.sql
2013-01-09 18:00:09 -07:00
..
kvm Summary: resizeVolume initial implementation 2013-01-08 11:24:58 -07:00
ovm Start removing the old ant build files 2012-12-07 15:58:56 +01:00
simulator Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
vmware Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
xen Summary: resizeVolume initial implementation 2013-01-08 11:24:58 -07:00