cloudstack/plugins/hypervisors/simulator/src/com/cloud
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
..
agent simulator: resurrect simulator hypervisor as plugin 2012-12-23 19:28:57 -08:00
api/commands Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
configuration Simulator: moving hypervisor simulator into plugin 2012-12-22 13:02:57 -08:00
resource simulator: resurrect simulator hypervisor as plugin 2012-12-23 19:28:57 -08:00
server Simulator: moving hypervisor simulator into plugin 2012-12-22 13:02:57 -08:00
simulator simulator:Using the priority to decide b/w MASTER/BACKUP 2012-12-22 14:09:59 -08:00