etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins
History
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
..
acl/static-role-based Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
api/discovery Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
deployment-planners Start removing the old ant build files 2012-12-07 15:58:56 +01:00
file-systems/netapp Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
host-allocators/random Start removing the old ant build files 2012-12-07 15:58:56 +01:00
hypervisors Merge branch 'master' into resizevolume 2013-01-09 18:00:09 -07:00
network-elements Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
storage-allocators/random Start removing the old ant build files 2012-12-07 15:58:56 +01:00
user-authenticators Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
pom.xml Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00