Rohit Yadav 85e73a640e Merge branch 'master' into api_refactoring ... Conflicts: client/tomcatconf/commands.properties.in Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-03 23:27:42 -08:00
..
bindirbak	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00
conf	Uniting all the READMEs from tools and test	2012-10-12 17:01:20 +05:30
integration	Merge branch 'master' into api_refactoring	2013-01-03 23:27:42 -08:00
metadata	License header updates for the test folder.	2012-08-03 10:39:05 -04:00
scripts	CLOUDSTACK-28 wget.exe (GPLed) is present in the tools directory as a binary	2012-09-24 10:31:47 -04:00
src/com/cloud	Remove @author tag from non third-party source files in agent-simulator, cloud-cli, test, ui and utils folder	2012-08-13 15:30:42 +08:00
pom.xml	Updated master to 4.1.0	2012-10-01 11:00:55 -07:00
setup-test-data.sh	Bash is not python!	2012-10-30 10:37:16 +05:30