cloudstack/plugins
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
..
deployment-planners Start removing the old ant build files 2012-12-07 15:58:56 +01:00
file-systems/netapp Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
host-allocators/random Start removing the old ant build files 2012-12-07 15:58:56 +01:00
hypervisors Merge branch 'master' into api_refactoring 2012-12-25 09:51:17 -08:00
network-elements api: Annotate apis in various plugins 2012-12-23 18:03:23 -08:00
storage-allocators/random Start removing the old ant build files 2012-12-07 15:58:56 +01:00
user-authenticators Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
pom.xml simulator: resurrect simulator hypervisor as plugin 2012-12-23 19:28:57 -08:00