Rohit Yadav b720675bfe Merge branch 'master' into api_refactoring ... Getting ready for merge request for master, sync changes Conflicts: client/tomcatconf/commands.properties.in Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-06 01:11:16 -08:00
..
com/cloud	Merge branch 'master' into api_refactoring	2013-01-06 01:11:16 -08:00
resources	Patch from Gavin Lee: Change license to ASL2.0 in server and tools	2012-08-30 10:36:29 -04: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