etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test
History
Alena Prokharchyk 3795048fcc Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/async/AsyncJob.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-11 14:16:33 -07:00
..
com/cloud Merge branch 'master' into internallb1 2013-04-11 14:16:33 -07:00
org/apache/cloudstack Fixes to unit-test dues to changes in master 2013-04-11 13:23:48 -07:00
resources Fixes to unit-test dues to changes in master 2013-04-11 13:23:48 -07: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