Repository: cloudstack Updated Branches: refs/heads/master aae1424f3 -> fc04e4b4e
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/fc04e4b4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc04e4b4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc04e4b4 Branch: refs/heads/master Commit: fc04e4b4ec3ad81442ed57d42f76dd965694b6fc Parents: aae1424 Author: Ove Ewerlid <ove.ewer...@oracle.com> Authored: Tue May 6 23:43:41 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Tue May 6 23:43:41 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/fc04e4b4/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 cf5d355..f21e264 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,
