cloudstack/server/test
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
..
com/cloud Add missing Apache license header. 2013-03-08 14:38:35 -08:00
org/apache/cloudstack/region CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces. 2013-03-08 19:02:41 +05:30
resources From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001 2013-02-25 14:57:57 -08:00
async-job-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00