cloudstack/setup
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
..
bindir CLOUDSTACK-196: cloud-set-guest-password enhancement to support Debian 2012-10-28 15:39:42 +05:30
db Merge branch 'master' into api_refactoring 2013-01-02 13:57:55 -08:00