cloudstack/server
Rohit Yadav d8d87adc22 Merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/api/commands/ListS3sCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 13:57:55 -08:00
..
conf License header updates for the server folder. 2012-08-03 09:41:27 -04:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src/com/cloud Merge branch 'master' into api_refactoring 2013-01-02 13:57:55 -08:00
test Create DB view for Volume to speed up ListVolumesCmd. 2012-12-25 17:08:50 -08:00
pom.xml Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00