etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
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
..
conf License header updates for the server folder. 2012-08-03 09:41:27 -04:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src/com/cloud Merge branch 'master' into api_refactoring 2012-12-25 09:51:17 -08:00
test Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
pom.xml Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00