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
..
component	marvin tests: marking the xen specific tests	2013-01-03 22:13:14 -08:00
smoke	CLOUDSTACK-736: Make integration smoke test assert on deployed vm name from response	2013-01-03 15:37:09 -08:00
__init__.py	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00