etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client
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
..
WEB-INF CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references 2012-12-16 20:39:03 -08:00
bindir License header update for the client folder 2012-08-01 13:49:10 -04:00
distro Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00
tomcatconf Merge branch 'master' into resizevolume 2013-01-09 18:00:09 -07:00
cloudstack-ui.launch client: Re-add missing license header in client/cloudstack-ui.launch 2012-12-23 02:47:27 -08:00
pom.xml Summary: Fixes for api_refactoring 2013-01-09 17:48:22 -07:00