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

..

src

Merge branch 'master' into resizevolume

2013-01-09 18:00:09 -07:00

test

Summary: Fixes for api_refactoring

2013-01-09 17:48:22 -07:00

pom.xml

Unit test additions (and some minor command class changes to support testing)

2012-11-20 12:21:54 -05:00