Rohit Yadav 78d70d349b Merge branch 'master' into api_refactoring ... - Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password - TODO: Fix response, only partially applied Conflicts: api/src/org/apache/cloudstack/api/response/UserResponse.java client/tomcatconf/commands.properties.in server/src/com/cloud/api/ApiResponseHelper.java Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2012-12-25 09:51:17 -08:00
..
WEB-INF	CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references	2012-12-16 20:39:03 -08:00
bindir	License header update for the client folder	2012-08-01 13:49:10 -04:00
distro	debian: Update locations where to search for Java under Ubuntu and Debian	2012-09-11 15:22:17 +02:00
tomcatconf	Merge branch 'master' into api_refactoring	2012-12-25 09:51:17 -08:00
cloudstack-ui.launch	client: Re-add missing license header in client/cloudstack-ui.launch	2012-12-23 02:47:27 -08:00
pom.xml	simulator: resurrect simulator hypervisor as plugin	2012-12-23 19:28:57 -08:00