You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/06 23:46:08 UTC
git commit: updated refs/heads/4.4-forward to 9db53e5
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 4c304324a -> 9db53e501
CLOUDSTACK-6570 API breakage of the UpdateUser API call
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9db53e50
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9db53e50
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9db53e50
Branch: refs/heads/4.4-forward
Commit: 9db53e5012f91ac532b86e81661e06516207b72b
Parents: 4c30432
Author: Ove Ewerlid <ov...@oracle.com>
Authored: Tue May 6 23:43:41 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue May 6 23:45:51 2014 +0200
----------------------------------------------------------------------
.../apache/cloudstack/api/command/admin/user/UpdateUserCmd.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9db53e50/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
index 46b01aa..e7236e8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
@@ -45,7 +45,7 @@ public class UpdateUserCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.API_KEY, type = CommandType.STRING, description = "The API key for the user. Must be specified with userSecretKey")
+ @Parameter(name = ApiConstants.USER_API_KEY, type = CommandType.STRING, description = "The API key for the user. Must be specified with userSecretKey")
private String apiKey;
@Parameter(name = ApiConstants.EMAIL, type = CommandType.STRING, description = "email")
@@ -65,7 +65,7 @@ public class UpdateUserCmd extends BaseCmd {
description = "Clear text password (default hashed to SHA256SALT). If you wish to use any other hasing algorithm, you would need to write a custom authentication adapter")
private String password;
- @Parameter(name = ApiConstants.SECRET_KEY, type = CommandType.STRING, description = "The secret key for the user. Must be specified with userApiKey")
+ @Parameter(name = ApiConstants.SECRET_KEY, type = CommandType.STRING, description = "The secret key for the user. Must be specified with userSecretKey")
private String secretKey;
@Parameter(name = ApiConstants.TIMEZONE,