cloudstack/server
Murali Reddy fea98fa66b Merge branch 'master' into gslb-wip
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/Config.java
	setup/db/create-schema.sql
2013-03-11 14:28:26 +05:30
..
conf From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001 2013-02-25 14:57:57 -08:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge branch 'master' into gslb-wip 2013-03-11 14:28:26 +05:30
test Merge branch 'master' into gslb-wip 2013-03-11 14:28:26 +05:30
pom.xml ignore the tests looking for db 2013-03-01 12:04:06 +05:30